From 08f1df81497049348656022629969b343c8a5651 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 29 Oct 2007 16:42:30 +0000 Subject: [PATCH] forgot bugzilla 343061 --- R.spec | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/R.spec b/R.spec index d437bd3..64a6e84 100644 --- a/R.spec +++ b/R.spec @@ -182,6 +182,10 @@ install -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/ 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 @@ fi /sbin/ldconfig %changelog +* Mon Oct 29 2007 Tom "spot" Callaway 2.6.0-3 +- fix multilib conflicts (bz 343061) + * Mon Oct 29 2007 Tom "spot" Callaway 2.6.0-2 - add R CMD javareconf to post (bz 354541) - don't pickup bogus perl provides (bz 356071)