icu rebuild

[packages/R.git] / R.spec

diff --git a/R.spec b/R.spec
index e2f6aa87f17eeabb2d217a5fe4a4639dbf656c84..7a6e13fc9309aa3d61d6bb32249bc43b2082fc83 100644 (file)
--- a/R.spec
+++ b/R.spec
@@ -3,7 +3,7 @@
 %bcond_without openmp  # OpenMP support
 %bcond_without tcl     # Tcl/Tk support
 %bcond_without tests   # do not run "make check"
-%bcond_without docs    # do not build documentation
+%bcond_without doc     # do not build documentation
 #
 # NOTE:
 # - /etc/localtime must be present for tests to work
@@ -14,16 +14,17 @@
 Summary:       A language for data analysis and graphics
 Summary(pl.UTF-8):     Język do analizy danych oraz grafiki
 Name:          R
-Version:       3.6.1
-Release:       1
+Version:       4.1.3
+Release:       2
 License:       mixed (distributable), mostly GPL v2+
 Group:         Development/Languages
-# CRAN master site: ftp://cran.r-project.org/pub/R/src/
-Source0:       ftp://stat.ethz.ch/R-CRAN/src/base/R-3/%{name}-%{version}.tar.gz
-# Source0-md5: f5003472d58a3d3765a1c537fdae71d5
+Source0:       https://cran.r-project.org/src/base/R-4/%{name}-%{version}.tar.gz
+# Source0-md5: 409bc782b1a42c8247712f6446d7d640
 Source1:       %{name}.desktop
 Source2:       %{name}.xpm
-URL:           http://www.r-project.org/
+Patch0:                %{name}-timezone.patch
+Patch1:                curl8.patch
+URL:           https://www.r-project.org/
 # yes, it is, or tests will fail
 BuildRequires: /etc/localtime
 BuildRequires: autoconf >= 2.69
@@ -38,15 +39,13 @@ BuildRequires:      lapack-devel >= 3.2.2-2
 %{?with_openmp:BuildRequires:  libgomp-devel}
 BuildRequires: libicu-devel
 BuildRequires: libjpeg-devel >= 6b
-BuildRequires: libpng-devel >= 1.2.7
+BuildRequires: libpng-devel >= 2:1.2.7
 BuildRequires: libstdc++-devel
 BuildRequires: libtiff-devel
+BuildRequires: libtirpc-devel
 BuildRequires: libtool >= 2:2.0
-BuildRequires: libxml2-devel >= 2.6.26
 BuildRequires: pango-devel
-BuildRequires: pcre-devel >= 8.32
-# actually not used
-#BuildRequires:        pcre2-8-devel
+BuildRequires: pcre2-8-devel
 BuildRequires: perl-base >= 1:5.6
 BuildRequires: pkgconfig
 BuildRequires: readline-devel
@@ -55,12 +54,14 @@ BuildRequires:      rpm-perlprov
 BuildRequires: tcl-devel >= 8.4
 BuildRequires: tk-devel >= 8.4
 %endif
-BuildRequires: tre-devel
-%if %{with docs}
-BuildRequires: tetex-dvips
-BuildRequires: tetex-latex
-BuildRequires: tetex-pdftex
+# 0.8.0 is too old currently (checking for tre_regncompb in -ltre... no)
+#BuildRequires:        tre-devel >= ?
+%if %{with doc}
 BuildRequires: texinfo-texi2dvi >= 4.7
+BuildRequires: texlive-dvips
+BuildRequires: texlive-latex
+BuildRequires: texlive-latex-ae
+BuildRequires: texlive-pdftex
 %endif
 BuildRequires: xorg-lib-libX11-devel
 BuildRequires: xorg-lib-libXmu-devel
@@ -118,6 +119,8 @@ Narzędzia R w Javie.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p0
 
 %build
 %{__aclocal} -I m4
@@ -155,7 +158,7 @@ cd build
 %{__make} check
 %endif
 
-%if %{with docs}
+%if %{with doc}
 %{__make} docs pdf info
 %endif
 
@@ -222,7 +225,7 @@ done > R.files
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/R/doc/COPYING
 # packaged as %doc
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/R/doc/{AUTHORS,COPYRIGHTS,FAQ,NEWS.rds,THANKS}
-%if %{with docs}
+%if %{with doc}
 # pdf version of NEWS
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/R/doc/NEWS.pdf
 %endif