commit 99% of Martyn's spec changes

R.spec

@@ -1,6 +1,6 @@
 Name: R
 Version: 2.6.1
-Release: 1%{?dist}
+Release: 2%{?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
@@ -135,7 +135,10 @@ export F77="gfortran"
     --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 +147,13 @@ make pdf
 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 \
+(cd src/nmath/standalone; make install DESTDIR=${RPM_BUILD_ROOT})
-    includedir=${RPM_BUILD_ROOT}%{_includedir} \
-    libdir=${RPM_BUILD_ROOT}%{_libdir})
-
-#Fix location of R_HOME_DIR in shell wrapper.
-#
-sed -e "s@R_HOME_DIR=.*@R_HOME_DIR=%{_libdir}/R@" < bin/R \
-  > ${RPM_BUILD_ROOT}%{_libdir}/R/bin/R
-sed -e "s@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)
 
 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 +169,7 @@ 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 ${RPM_BUILD_ROOT}%{_docdir}/R-%{version}/CAPABILITIES
 touch -r NEWS doc/manual/*.pdf
 touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/R
 
@@ -201,24 +178,28 @@ touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/R
 %{_bindir}/R
 %{_bindir}/Rscript
 %{_datadir}/R
-%{_libdir}/R
+%dir %{_libdir}/R
+%{_libdir}/R/bin/[!I]*
+%{_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
+%{_libdir}/R/bin/INSTALL
 
 %files -n libRmath
 %defattr(-, root, root)
@@ -246,7 +227,6 @@ done
 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
 # 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
@@ -260,10 +240,6 @@ if [ $1 = 0 ]; then
          /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 +252,13 @@ fi
 /sbin/ldconfig
 
 %changelog
+* Tue Dec 11 2007 Tom "spot" Callaway <tcallawa@redhat.com> 2.6.1-2
+- based on changes from Martyn Plummer <martyn.plummer@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@redhat.com> 2.6.1-1
 - bump to 2.6.1