rpms
/
R-colorspace
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to latest version.

This commit is contained in:
Elliott Sales de Andrade 2019-02-15 23:01:44 -05:00
parent 0e27ead181
commit c3432a88b2
4 changed files with 93 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1 +1,2 @@
/colorspace_1.3-2.tar.gz
/colorspace_1.4-0.tar.gz

72
R-colorspace.spec
View File

@ -1,66 +1,92 @@
%global packname colorspace
%global packvers 1.4-0
%global rlibdir %{_libdir}/R/library
# Not yet available.
%global with_suggests 0
Name: R-%{packname}
Version: 1.3.2
Release: 4%{?dist}
Summary: Color Space Manipulation
Version: 1.4.0
Release: 1%{?dist}
Summary: A Toolbox for Manipulating and Assessing Colors and Palettes
License: BSD
URL: https://CRAN.R-project.org/package=%{packname}
Source0: https://cran.r-project.org/src/contrib/%{packname}_1.3-2.tar.gz
Source0: https://cran.r-project.org/src/contrib/%{packname}_%{packvers}.tar.gz
Patch0001: fix-rounding-error-output.patch
# Here's the R view of the dependencies world:
# Depends: R-methods
# Imports: R-graphics, R-grDevices
# Suggests: R-datasets, R-stats, R-utils, R-KernSmooth, R-MASS, R-kernlab, R-mvtnorm, R-vcd, R-dichromat, R-tcltk, R-shiny, R-shinyjs
# Imports: R-graphics, R-grDevices, R-stats
# Suggests: R-datasets, R-utils, R-KernSmooth, R-MASS, R-kernlab, R-mvtnorm, R-vcd, R-tcltk, R-shiny, R-shinyjs, R-ggplot2, R-dplyr, R-scales, R-grid, R-png, R-jpeg, R-knitr, R-rmarkdown, R-RColorBrewer, R-rcartocolor, R-scico, R-viridis
# LinkingTo:
# Enhances:
Requires: R-methods
Requires: R-graphics
Requires: R-grDevices
Suggests: R-stats
Requires: R-stats
Suggests: R-datasets
Suggests: R-utils
Suggests: R-dichromat
Suggests: R-tcltk
Suggests: R-shiny
Suggests: R-shinyjs
# Only used for example plots:
Recommends: R-datasets
Suggests: R-ggplot2
Suggests: R-scales
Suggests: R-grid
Suggests: R-png
Suggests: R-jpeg
Suggests: R-RColorBrewer
Suggests: R-rcartocolor
Suggests: R-scico
Suggests: R-viridis
BuildRequires: R-devel
BuildRequires: tex(latex)
BuildRequires: R-methods
BuildRequires: R-graphics
BuildRequires: R-grDevices
BuildRequires: R-stats
%if %{with_suggests}
BuildRequires: R-datasets
BuildRequires: R-stats
BuildRequires: R-utils
BuildRequires: R-KernSmooth
BuildRequires: R-MASS
BuildRequires: R-kernlab
BuildRequires: R-mvtnorm
BuildRequires: R-vcd
BuildRequires: R-dichromat
BuildRequires: R-tcltk
BuildRequires: R-shiny
BuildRequires: R-shinyjs
BuildRequires: R-ggplot2
BuildRequires: R-dplyr
BuildRequires: R-scales
BuildRequires: R-grid
BuildRequires: R-png
BuildRequires: R-jpeg
BuildRequires: R-knitr
BuildRequires: R-rmarkdown
BuildRequires: R-RColorBrewer
BuildRequires: R-rcartocolor
BuildRequires: R-scico
BuildRequires: R-viridis
%endif
%description
Carries out mapping between assorted color spaces including RGB, HSV, HLS,
CIEXYZ, CIELUV, HCL (polar CIELUV), CIELAB and polar CIELAB. Qualitative,
sequential, and diverging color palettes based on HCL colors are provided along
with an interactive palette picker (with either a Tcl/Tk or a shiny GUI).
Carries out mapping between assorted color spaces including RGB, HSV,
HLS, CIEXYZ, CIELUV, HCL (polar CIELUV), CIELAB and polar CIELAB.
Qualitative, sequential, and diverging color palettes based on HCL colors
are provided along with corresponding ggplot2 color scales. Color palette
choice is aided by an interactive app (with either a Tcl/Tk or a shiny
GUI) and shiny apps with an HCL color picker and a color vision
deficiency emulator. Plotting functions for displaying and assessing
palettes include color swatches, visualizations of the HCL space, and
trajectories in HCL and/or RGB spectrum. Color manipulation functions
include: desaturation, lightening/darkening, mixing, and simulation of
color vision deficiencies (deutanomaly, protanomaly, tritanomaly).
%prep
%setup -q -c -n %{packname}
%autosetup -c -n %{packname} -p0
%build
@ -77,7 +103,7 @@ rm -f %{buildroot}%{rlibdir}/R.css
%if %{with_suggests}
%{_bindir}/R CMD check %{packname}
%else
_R_CHECK_FORCE_SUGGESTS_=0 %{_bindir}/R CMD check %{packname} --ignore-vignettes
_R_CHECK_FORCE_SUGGESTS_=0 %{_bindir}/R CMD check %{packname} --ignore-vignettes --no-examples
%endif
@ -86,7 +112,7 @@ _R_CHECK_FORCE_SUGGESTS_=0 %{_bindir}/R CMD check %{packname} --ignore-vignettes
%doc %{rlibdir}/%{packname}/doc
%doc %{rlibdir}/%{packname}/html
%{rlibdir}/%{packname}/DESCRIPTION
%doc %{rlibdir}/%{packname}/NEWS
%doc %{rlibdir}/%{packname}/NEWS.md
%doc %{rlibdir}/%{packname}/CITATION
%license %{rlibdir}/%{packname}/LICENSE
%{rlibdir}/%{packname}/INDEX
@ -94,13 +120,19 @@ _R_CHECK_FORCE_SUGGESTS_=0 %{_bindir}/R CMD check %{packname} --ignore-vignettes
%{rlibdir}/%{packname}/Meta
%{rlibdir}/%{packname}/R
%{rlibdir}/%{packname}/help
%{rlibdir}/%{packname}/cvdemulator
%{rlibdir}/%{packname}/data
%{rlibdir}/%{packname}/demo
%{rlibdir}/%{packname}/hclcolorpicker
%{rlibdir}/%{packname}/hclwizard
%dir %{rlibdir}/%{packname}/libs
%{rlibdir}/%{packname}/libs/%{packname}.so
%changelog
* Fri Feb 15 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 1.4.0-1
- Update to latest version
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

39
fix-rounding-error-output.patch Normal file
View File

@ -0,0 +1,39 @@
diff -uPNr colorspace.orig/MD5 colorspace/MD5
--- colorspace.orig/MD5 2019-01-13 08:01:42.000000000 -0500
+++ colorspace/MD5 2019-02-15 23:00:48.304703829 -0500
@@ -216,8 +216,8 @@
a46f3e8f7ffa1e75dfe3bf754e1180d4 *src/colorspace.c
4ac5ec142bab094f6dc821c7ec04d41e *src/init.c
a99184f15b513a8eb77df5ff72aa9d69 *tests/Examples/colorspace-Ex.Rout.save
-927a97c81819b7b7d848429114fc736a *tests/cvd.R
-810a058950a467918a465a30795e7679 *tests/cvd.Rout.save
+092ecccfedd12aae2f762225f54b77db *tests/cvd.R
+399cbe0c6f89c2be619f54b8565f83cf *tests/cvd.Rout.save
2425011e4fac8a79ccb11df2f7f1df75 *tests/palettes.R
973fbe71df3cdc9e20d142be81e95714 *tests/palettes.Rout.save
f2c731d633562b66f8415304fe9fef13 *vignettes/color.bib
diff -uPNr colorspace.orig/tests/cvd.R colorspace/tests/cvd.R
--- colorspace.orig/tests/cvd.R 2017-11-01 15:03:41.000000000 -0400
+++ colorspace/tests/cvd.R 2019-02-15 22:49:54.756309210 -0500
@@ -9,5 +9,5 @@
## convert a mixed vector (hex and built-in)
simulate_cvd(c("green", "#ffc0cb"), protanomaly_cvd["8"][[1]])
-## white and black unchanged (white becomes #FEFFFE due to a rounding error)
+## white and black unchanged (white becomes #FEFEFF due to a rounding error)
simulate_cvd(c("white", "black"), deutanomaly_cvd["2"][[1]])
diff -uPNr colorspace.orig/tests/cvd.Rout.save colorspace/tests/cvd.Rout.save
--- colorspace.orig/tests/cvd.Rout.save 2017-11-01 15:03:41.000000000 -0400
+++ colorspace/tests/cvd.Rout.save 2019-02-15 22:50:05.623198434 -0500
@@ -29,9 +29,9 @@
> simulate_cvd(c("green", "#ffc0cb"), protanomaly_cvd["8"][[1]])
[1] "#EBCD00" "#CEC7CB"
>
-> ## white and black unchanged (white becomes #FEFFFE due to a rounding error)
+> ## white and black unchanged (white becomes #FEFEFF due to a rounding error)
> simulate_cvd(c("white", "black"), deutanomaly_cvd["2"][[1]])
-[1] "#FEFFFE" "#000000"
+[1] "#FEFEFF" "#000000"
>
> proc.time()
user system elapsed

2
sources
View File

@ -1 +1 @@
SHA512 (colorspace_1.3-2.tar.gz) = 02ee4e2c1bf6aa32ce2a02d2f21251b0d1656a2fb2bcd925be33d155a804c7ca1aefb0ab407dab0995ec5902cb3ba5e7c7343b17ea3088ced6e94fd1527e99bd
SHA512 (colorspace_1.4-0.tar.gz) = 1b94f2f7b50d3c633ab0c0a32e069c85f2e6de87555baa77004cab23a995eb7d1a33cf005fe6eab18d6ab0f5ec0dad3895b858a82f82e18fd88cb3c01ec94a0f