rpms/R/devel R.spec,1.42,1.43

Tom Callaway (spot) fedora-extras-commits at redhat.com
Wed May 21 15:32:15 UTC 2008


Author: spot

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

Modified Files:
	R.spec 
Log Message:
fix poorly constructed file paths in html/packages.html (bz 442727)


Index: R.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R/devel/R.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- R.spec	13 May 2008 16:55:43 -0000	1.42
+++ R.spec	21 May 2008 15:31:07 -0000	1.43
@@ -1,6 +1,6 @@
 Name: R
 Version: 2.7.0
-Release: 2%{?dist}
+Release: 3%{?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
@@ -193,6 +193,10 @@
 touch -r NEWS doc/manual/*.pdf
 touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/R
 
+# Fix html/packages.html
+# We can safely use RHOME here, because all of these are system packages.
+sed -i "s!../..!%{_libdir}/R!g" $RPM_BUILD_ROOT%{_docdir}/R-%{version}/html/packages.html
+
 %files
 %defattr(-, root, root)
 %{_bindir}/R
@@ -277,6 +281,9 @@
 /sbin/ldconfig
 
 %changelog
+* Wed May 21 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.7.0-3
+- fix poorly constructed file paths in html/packages.html (bz 442727)
+
 * Tue May 13 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.7.0-2
 - add patch from Martyn Plummer to avoid possible bad path hardcoding in 
   /usr/bin/Rscript




More information about the scm-commits mailing list