X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=R.spec;h=517e86bdf4b72f6548596cfec06c9c4bc046c5a8;hb=a8086dc4ca5699e24ab07c0ce38ac61ac0a07b52;hp=645e449c4f7c989a6bc40d712c554bcf00bb3720;hpb=a7b0ffa6588d03c8b5d7c37699e5e2a25881449e;p=packages%2FR.git

diff --git a/R.spec b/R.spec
index 645e449..517e86b 100644
--- a/R.spec
+++ b/R.spec
@@ -14,13 +14,13 @@
 Summary:	A language for data analysis and graphics
 Summary(pl.UTF-8):	Język do analizy danych oraz grafiki
 Name:		R
-Version:	3.0.2
+Version:	3.1.2
 Release:	1
 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:	f9a8374736e7650e4848f33e2e3bbee3
+# Source0-md5:	3af29ec06704cbd08d4ba8d69250ae74
 Source1:	%{name}.desktop
 Source2:	%{name}.xpm
 URL:		http://www.r-project.org/
@@ -30,7 +30,7 @@ BuildRequires:	blas-devel >= 3.2.2-2
 BuildRequires:	bzip2-devel >= 1.0.6
 BuildRequires:	cairo-devel >= 1.6
 BuildRequires:	gcc-fortran
-BuildRequires:	gettext-devel >= 0.14.5
+BuildRequires:	gettext-tools >= 0.14.5
 BuildRequires:	lapack-devel >= 3.2.2-2
 BuildRequires:	libicu-devel
 BuildRequires:	libjpeg-devel >= 6b
@@ -213,7 +213,7 @@ done > R.files
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/R/doc/{AUTHORS,COPYRIGHTS,FAQ,NEWS.rds,THANKS}
 %if %{with docs}
 # pdf version of NEWS
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/R/NEWS.pdf
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/R/doc/NEWS.pdf
 %endif
 
 %clean
@@ -224,7 +224,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f R.files
 %defattr(644,root,root,755)
-%doc NEWS* README doc/{AUTHORS,COPYRIGHTS,FAQ,RESOURCES,THANKS}
+%doc README doc/{AUTHORS,COPYRIGHTS,FAQ,NEWS,NEWS.[012],RESOURCES,THANKS}
 %attr(755,root,root) %{_bindir}/R
 %attr(755,root,root) %{_bindir}/Rscript
 %dir %{_libdir}/R
@@ -232,7 +232,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/R/lib/libR.so
 %attr(755,root,root) %{_libdir}/libR.so
 %{_libdir}/R/COPYING
-%{_libdir}/R/NEWS*
 %{_libdir}/R/SVN-REVISION
 %attr(755,root,root) %{_libdir}/R/bin
 %exclude %{_libdir}/R/bin/javareconf
@@ -240,6 +239,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/R/doc
 %{_libdir}/R/doc/[KRm]*
 %{_libdir}/R/doc/CRAN_mirrors.csv
+%{_libdir}/R/doc/NEWS*
 %dir %{_libdir}/R/doc/html
 %{_libdir}/R/doc/html/*.css
 %{_libdir}/R/doc/html/[NRSa-lr-u]*.html