X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=R.spec;h=7a6e13fc9309aa3d61d6bb32249bc43b2082fc83;hb=HEAD;hp=2a221ad5a43b385413e40a03ce8d3900422fd1f0;hpb=618968ae9d29e1536e719fc59d6046e3634e1cc5;p=packages%2FR.git

diff --git a/R.spec b/R.spec
index 2a221ad..7a6e13f 100644
--- a/R.spec
+++ b/R.spec
@@ -14,17 +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.3
-Release:	6
+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:	506c9576ba33e1262ad5b5624db9d96a
+Source0:	https://cran.r-project.org/src/base/R-4/%{name}-%{version}.tar.gz
+# Source0-md5:	409bc782b1a42c8247712f6446d7d640
 Source1:	%{name}.desktop
 Source2:	%{name}.xpm
 Patch0:		%{name}-timezone.patch
-URL:		http://www.r-project.org/
+Patch1:		curl8.patch
+URL:		https://www.r-project.org/
 # yes, it is, or tests will fail
 BuildRequires:	/etc/localtime
 BuildRequires:	autoconf >= 2.69
@@ -39,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
@@ -56,11 +54,13 @@ BuildRequires:	rpm-perlprov
 BuildRequires:	tcl-devel >= 8.4
 BuildRequires:	tk-devel >= 8.4
 %endif
-BuildRequires:	tre-devel
+# 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
@@ -120,6 +120,7 @@ Narzędzia R w Javie.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p0
 
 %build
 %{__aclocal} -I m4