rpms/R/EL-5 R.spec,1.29,1.30 sources,1.13,1.14

[Tom Callaway (spot)]

Author: spot

Update of /cvs/pkgs/rpms/R/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27831

Modified Files:
	R.spec sources 
Log Message:

Bring EL-5 current



Index: R.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R/EL-5/R.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- R.spec	26 Aug 2007 22:51:32 -0000	1.29
+++ R.spec	11 Jan 2008 22:10:52 -0000	1.30
@@ -1,6 +1,6 @@
 Name: R
-Version: 2.5.1
-Release: 2%{?dist}
+Version: 2.6.1
+Release: 1%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
@@ -18,7 +18,7 @@
 BuildRequires: libSM-devel, libX11-devel, libICE-devel, libXt-devel
 BuildRequires: bzip2-devel, libXmu-devel
 BuildRequires: gcc-objc
-Requires: evince, cups, firefox
+Requires: xdg-utils, cups
 
 # These are the submodules that R provides. Sometimes R modules say they
 # depend on one of these submodules rather than just R. These are 
@@ -26,7 +26,7 @@
 Provides: R-base = %{version}
 Provides: R-boot = 1.2
 Provides: R-class = %{version}
-Provides: R-cluster = 1.11.7
+Provides: R-cluster = 1.11.9
 Provides: R-codetools = 0.1
 Provides: R-datasets = %{version}
 Provides: R-foreign = 0.8
@@ -34,7 +34,7 @@
 Provides: R-grDevices = %{version}
 Provides: R-grid = %{version}
 Provides: R-KernSmooth = 2.22
-Provides: R-lattice = 0.15
+Provides: R-lattice = 0.17
 Provides: R-MASS = %{version}
 Provides: R-methods = %{version}
 Provides: R-mgcv = 1.3
@@ -46,7 +46,7 @@
 Provides: R-splines = %{version}
 Provides: R-stats = %{version}
 Provides: R-stats4 = %{version}
-Provides: R-survival = 2.32
+Provides: R-survival = 2.34
 Provides: R-tcltk = %{version}
 Provides: R-tools = %{version}
 Provides: R-utils = %{version}
@@ -104,13 +104,31 @@
 %prep
 %setup -q
 
+# Filter false positive provides.
+cat <<EOF > %{name}-prov
+#!/bin/sh
+%{__perl_provides} \
+| grep -v 'File::Copy::Recursive' | grep -v 'Text::DelimMatch'
+EOF
+%define __perl_provides %{_builddir}/R-%{version}/%{name}-prov
+chmod +x %{__perl_provides}
+
+# Filter unwanted Requires:
+cat << \EOF > %{name}-req
+#!/bin/sh
+%{__perl_requires} \
+| grep -v 'perl(Text::DelimMatch)'
+EOF
+%define __perl_requires %{_builddir}/R-%{version}/%{name}-req
+chmod +x %{__perl_requires}
+
 %build
 # Add PATHS to Renviron for R_LIBS
 echo 'R_LIBS=${R_LIBS-'"'%{_libdir}/R/library:%{_datadir}/R/library'"'}' >> etc/Renviron.in
 
-export R_PDFVIEWER="%{_bindir}/evince"
+export R_PDFVIEWER="%{_bindir}/xdg-open"
 export R_PRINTCMD="lpr"
-export R_BROWSER="%{_bindir}/firefox"
+export R_BROWSER="%{_bindir}/xdg-open"
 export F77="gfortran"
 ( %configure \
     --with-system-zlib --with-system-bzlib --with-system-pcre \
@@ -173,6 +191,11 @@
 mkdir -p $RPM_BUILD_ROOT/usr/lib/rpm/
 install -m0755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/rpm/
 
+# Fix multilib
+touch -r NEWS CAPABILITIES
+touch -r NEWS doc/manual/*.pdf
+touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/R
+
 %files
 %defattr(-, root, root)
 %{_bindir}/R
@@ -220,6 +243,7 @@
    fi
 done
 /sbin/ldconfig
+R CMD javareconf || exit 0
 
 # Update package indices
 %{_bindir}/R CMD perl %{_libdir}/R/share/perl/build-help.pl --htmllists > /dev/null 2>/dev/null
@@ -252,6 +276,27 @@
 /sbin/ldconfig
 
 %changelog
+* Mon Nov 26 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.6.1-1
+- bump to 2.6.1
+
+* Tue Oct 30 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.6.0-3.1
+- fix missing perl requires
+
+* Mon Oct 29 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.6.0-3
+- fix multilib conflicts (bz 343061)
+
+* Mon Oct 29 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.6.0-2
+- add R CMD javareconf to post (bz 354541)
+- don't pickup bogus perl provides (bz 356071)
+- use xdg-open, drop requires for firefox/evince (bz 351841)
+
+* Thu Oct  4 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.6.0-1
+- bump to 2.6.0
+
+* Sun Aug 26 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.5.1-3
+- fix license tag
+- rebuild for ppc32
+
 * Thu Jul  5 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.5.1-2
 - add rpm helper macros, script
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R/EL-5/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	3 Jul 2007 02:04:50 -0000	1.13
+++ sources	11 Jan 2008 22:10:52 -0000	1.14
@@ -1 +1 @@
-162f6d5a1bd7c60fd652145e050f3f3c  R-2.5.1.tar.gz
+19c35a69e1afa73f5f70f91ff9939233  R-2.6.1.tar.gz