rpms/R/F-7 R-make-search-index.sh, 1.1, 1.2 R.spec, 1.37, 1.38 sources, 1.15, 1.16

Fri Feb 8 19:28:15 UTC 2008

Author: spot

Update of /cvs/pkgs/rpms/R/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18007/F-7

Modified Files:
	R-make-search-index.sh R.spec sources 
Log Message:

2.6.2, take package cleanups to all active releases



Index: R-make-search-index.sh
===================================================================
RCS file: /cvs/pkgs/rpms/R/F-7/R-make-search-index.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2

--- R-make-search-index.sh	6 Jul 2007 22:07:34 -0000	1.1
+++ R-make-search-index.sh	8 Feb 2008 19:27:40 -0000	1.2
@@ -3,9 +3,13 @@
 # Figure out what RHOME is set to
 TMP_R_HOME=`R RHOME`
 
+# Figure out what R_DOC_DIR is set to
+# Ideally, we could ask R just like we do for RHOME, but we can't yet.
+TMP_R_DOC_DIR=`grep "R_DOC_DIR=" /usr/bin/R | cut -d "=" -f 2`
+
 # Write out all the contents in arch and noarch library locations
-cat $TMP_R_HOME/library/*/CONTENTS > $TMP_R_HOME/doc/html/search/index.txt 2>/dev/null
-cat /usr/share/R/library/*/CONTENTS >> $TMP_R_HOME/doc/html/search/index.txt 2>/dev/null
+cat $TMP_R_HOME/library/*/CONTENTS > $TMP_R_DOC_DIR/html/search/index.txt 2>/dev/null
+cat /usr/share/R/library/*/CONTENTS >> $TMP_R_DOC_DIR/html/search/index.txt 2>/dev/null
 
 exit 0
 


Index: R.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R/F-7/R.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- R.spec	26 Nov 2007 21:10:27 -0000	1.37
+++ R.spec	8 Feb 2008 19:27:40 -0000	1.38
@@ -1,5 +1,5 @@
 Name: R
-Version: 2.6.1
+Version: 2.6.2
 Release: 1%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
@@ -25,7 +25,7 @@
 # provided for packager convenience. 
 Provides: R-base = %{version}
 Provides: R-boot = 1.2
-Provides: R-class = %{version}
+Provides: R-class = 7.2
 Provides: R-cluster = 1.11.9
 Provides: R-codetools = 0.1
 Provides: R-datasets = %{version}
@@ -35,14 +35,14 @@
 Provides: R-grid = %{version}
 Provides: R-KernSmooth = 2.22
 Provides: R-lattice = 0.17
-Provides: R-MASS = %{version}
+Provides: R-MASS = 7.2
 Provides: R-methods = %{version}
 Provides: R-mgcv = 1.3
 Provides: R-nlme = 3.1
-Provides: R-nnet = %{version}
+Provides: R-nnet = 7.2
 Provides: R-rcompgen = 0.1
 Provides: R-rpart = 3.1
-Provides: R-spatial = %{version}
+Provides: R-spatial = 7.2
 Provides: R-splines = %{version}
 Provides: R-stats = %{version}
 Provides: R-stats4 = %{version}
@@ -129,13 +129,32 @@
 export R_PDFVIEWER="%{_bindir}/xdg-open"
 export R_PRINTCMD="lpr"
 export R_BROWSER="%{_bindir}/xdg-open"
-export F77="gfortran"
+
+case "%{_target_cpu}" in
+      x86_64|mips64|ppc64|powerpc64|sparc64|s390x)
+          export CC="gcc -m64"
+          export CXX="g++ -m64"
+          export F77="gfortran -m64"
+          export FC="gfortran -m64"
+      ;;
+      *)
+          export CC="gcc -m32"
+          export CXX="g++ -m32"
+          export F77="gfortran -m32"
+          export FC="gfortran -m32"
+      ;;    
+esac
+
+export FCFLAGS="%{optflags}"
 ( %configure \
     --with-system-zlib --with-system-bzlib --with-system-pcre \
     --with-lapack \
     --with-tcl-config=%{_libdir}/tclConfig.sh \
     --with-tk-config=%{_libdir}/tkConfig.sh \
-    --enable-R-shlib )\
+    --enable-R-shlib \
+    rdocdir=%{_docdir}/R-%{version} \
+    rincludedir=%{_includedir}/R \
+    rsharedir=%{_datadir}/R) \
  | grep -A30 'R is now' - > CAPABILITIES
 make 
 (cd src/nmath/standalone; make)
@@ -144,39 +163,13 @@
 make info
 
 %install
-%makeinstall rhome=${RPM_BUILD_ROOT}%{_libdir}/R install-info
+make DESTDIR=${RPM_BUILD_ROOT} install install-info install-pdf
 rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
 rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir.old
+install -p CAPABILITIES ${RPM_BUILD_ROOT}%{_docdir}/R-%{version}
 
 #Install libRmath files
-(cd src/nmath/standalone; make install \
-    includedir=${RPM_BUILD_ROOT}%{_includedir} \
-    libdir=${RPM_BUILD_ROOT}%{_libdir})
-
-#Fix location of R_HOME_DIR in shell wrapper.
-#
-sed -e "s at R_HOME_DIR=.*@R_HOME_DIR=%{_libdir}/R@" < bin/R \
-  > ${RPM_BUILD_ROOT}%{_libdir}/R/bin/R
-sed -e "s at R_HOME_DIR=.*@R_HOME_DIR=%{_libdir}/R@" < bin/R \
-   > ${RPM_BUILD_ROOT}%{_bindir}/R
-chmod 755 ${RPM_BUILD_ROOT}%{_libdir}/R/bin/R 
-chmod 755 ${RPM_BUILD_ROOT}%{_bindir}/R
-
-# Get rid of buildroot in script
-for i in $RPM_BUILD_ROOT%{_libdir}/R/bin/Rscript $RPM_BUILD_ROOT%{_bindir}/Rscript $RPM_BUILD_ROOT%{_libdir}/pkgconfig/libR*.pc;
-do
-  sed -i "s|$RPM_BUILD_ROOT||g" $i;
-done
-
-# Remove package indices. They are rebuilt by the postinstall script.
-#
-rm -f ${RPM_BUILD_ROOT}%{_libdir}/R/doc/html/function.html
-rm -f ${RPM_BUILD_ROOT}%{_libdir}/R/doc/html/packages.html
-rm -f ${RPM_BUILD_ROOT}%{_libdir}/R/doc/html/search/index.txt
-
-# Some doc files are also installed. We don't need them
-(cd %{buildroot}%{_libdir}/R;
- rm -f AUTHORS COPYING COPYING.LIB COPYRIGHTS FAQ NEWS ONEWS RESOURCES THANKS)
+(cd src/nmath/standalone; make install DESTDIR=${RPM_BUILD_ROOT})
 
 mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d
 echo "%{_libdir}/R/lib" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}-%{_arch}.conf
@@ -192,7 +185,7 @@
 install -m0755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/rpm/
 
 # Fix multilib
-touch -r NEWS CAPABILITIES
+touch -r NEWS ${RPM_BUILD_ROOT}%{_docdir}/R-%{version}/CAPABILITIES
 touch -r NEWS doc/manual/*.pdf
 touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/R
 
@@ -201,24 +194,27 @@
 %{_bindir}/R
 %{_bindir}/Rscript
 %{_datadir}/R
-%{_libdir}/R
+%dir %{_libdir}/R
+%{_libdir}/R/bin
+%{_libdir}/R/etc
+%{_libdir}/R/lib
+%{_libdir}/R/library
+%{_libdir}/R/modules
+%{_libdir}/R/COPYING
+%{_libdir}/R/NEWS
+%{_libdir}/R/SVN-REVISION
 /usr/lib/rpm/R-make-search-index.sh
 %{_infodir}/R-*.info*
 %{_sysconfdir}/rpm/macros.R
 %{_mandir}/man1/*
+%{_docdir}/R-%{version}
+%docdir %{_docdir}/R-%{version}
 /etc/ld.so.conf.d/*
-%doc doc/AUTHORS CAPABILITIES doc/COPYING doc/COPYING.LIB doc/COPYRIGHTS doc/FAQ NEWS
-%doc ONEWS README doc/RESOURCES doc/THANKS VERSION
-%doc doc/manual/R-admin.pdf
-%doc doc/manual/R-FAQ.pdf
-%doc doc/manual/R-lang.pdf
-%doc doc/manual/R-data.pdf
-%doc doc/manual/R-intro.pdf
 
 %files devel
 %defattr(-, root, root)
-%doc doc/manual/R-exts.pdf
 %{_libdir}/pkgconfig/libR.pc
+%{_includedir}/R
 
 %files -n libRmath
 %defattr(-, root, root)
@@ -246,10 +242,10 @@
 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
-%__cat %{_libdir}/R/library/*/CONTENTS > %{_libdir}/R/doc/html/search/index.txt 2>/dev/null
+%__cat %{_libdir}/R/library/*/CONTENTS > %{_docdir}/R-%{version}/html/search/index.txt 2>/dev/null
+
 # This could fail if there are no noarch R libraries on the system.
-%__cat %{_datadir}/R/library/*/CONTENTS >> %{_libdir}/R/doc/html/search/index.txt 2>/dev/null || exit 0
+%__cat %{_datadir}/R/library/*/CONTENTS >> %{_docdir}/R-%{version}/html/search/index.txt 2>/dev/null || exit 0
 
 %preun 
 if [ $1 = 0 ]; then
@@ -260,10 +256,6 @@
          /sbin/install-info --delete R-${doc} %{_infodir}/dir 2>/dev/null || :
       fi
    done
-   # Remove package indices
-   %__rm -f %{_libdir}/R/doc/html/function.html
-   %__rm -f %{_libdir}/R/doc/html/packages.html
-   %__rm -f %{_libdir}/R/doc/html/search/index.txt
 fi
 
 %postun
@@ -276,6 +268,27 @@
 /sbin/ldconfig
 
 %changelog
+* Fri Feb  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.6.2-1
+- properly version the items in the VR bundle
+- 2.6.2
+- don't use setarch for java setup
+- fix R post script file
+
+* Thu Jan 31 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.6.1-4
+- multilib handling (thanks Martyn Plummer)
+- Update indices in the right place.
+
+* Mon Jan  7 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.6.1-3
+- move INSTALL back into R main package, as it is useful without the 
+  other -devel bits (e.g. installing noarch package from CRAN)
+
+* Tue Dec 11 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.6.1-2
+- based on changes from Martyn Plummer <martyn.plummer at r-project.org>
+- use configure options rdocdir, rincludedir, rsharedir 
+- use DESTDIR at installation
+- remove obsolete generation of packages.html
+- move header files and INSTALL R-devel package
+
 * Mon Nov 26 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.6.1-1
 - bump to 2.6.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R/F-7/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	26 Nov 2007 21:10:27 -0000	1.15
+++ sources	8 Feb 2008 19:27:40 -0000	1.16
@@ -1 +1 @@
-19c35a69e1afa73f5f70f91ff9939233  R-2.6.1.tar.gz
+1099cbf02c624ceb459d9bbc4d0d1448  R-2.6.2.tar.gz


