rpms/R/F-7 R.spec,1.32,1.33

[Tom Callaway (spot)]

Author: spot

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

Modified Files:
	R.spec 
Log Message:

forgot bugzilla 343061



Index: R.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R/F-7/R.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- R.spec	29 Oct 2007 15:51:05 -0000	1.32
+++ R.spec	29 Oct 2007 16:42:17 -0000	1.33
@@ -182,6 +182,10 @@
 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 doc/manual/*.pdf
+
 %files
 %defattr(-, root, root)
 %{_bindir}/R
@@ -262,6 +266,9 @@
 /sbin/ldconfig
 
 %changelog
+* Mon Oct 29 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.6.0-3
+- fix multilib conflicts (bz 343061)
+
 * Mon Oct 29 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.6.0-2
 - add R CMD javareconf to post (bz 354541)
 - don't pickup bogus perl provides (bz 356071)