rpms/R/F-7 R.spec,1.41,1.42

[Tom Callaway (spot)]

Author: spot

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

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/F-7/R.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- R.spec	13 May 2008 17:55:15 -0000	1.41
+++ R.spec	21 May 2008 15:29:24 -0000	1.42
@@ -1,6 +1,6 @@
 Name: R
 Version: 2.7.0
-Release: 2%{?dist}.1
+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,8 +281,8 @@
 /sbin/ldconfig
 
 %changelog
-* Tue May 13 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.7.0-2.1
-- fix sources
+* 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