rpms/R/devel R.spec,1.38,1.39

[Tom Callaway (spot)]

Author: spot

Update of /cvs/pkgs/rpms/R/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10475

Modified Files:
	R.spec 
Log Message:

multilib handling, update indices in the right place



Index: R.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R/devel/R.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- R.spec	7 Jan 2008 15:25:50 -0000	1.38
+++ R.spec	31 Jan 2008 19:48:25 -0000	1.39
@@ -1,6 +1,6 @@
 Name: R
 Version: 2.6.1
-Release: 3%{?dist}
+Release: 4%{?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
@@ -129,7 +129,23 @@
 export R_PDFVIEWER="%{_bindir}/xdg-open"
 export R_PRINTCMD="lpr"
 export R_BROWSER="%{_bindir}/xdg-open"
-export F77="gfortran"
+
+case "%{_build_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 \
@@ -223,12 +239,13 @@
    fi
 done
 /sbin/ldconfig
-R CMD javareconf || exit 0
+setarch %{_build_cpu} R CMD javareconf || exit 0
 
 # Update package indices
-%__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
@@ -251,6 +268,10 @@
 /sbin/ldconfig
 
 %changelog
+* 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)