From 2f783435360093b5b095f5c2896cd722ed0de17c148974765cbdebd16797f2db Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Sat, 16 Jun 2007 23:31:18 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mono-core?expand=0&rev=6 --- mono-config_rpm_requires.patch | 2 +- mono-core.changes | 9 +++++++++ mono-core.spec | 10 ++++++++-- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/mono-config_rpm_requires.patch b/mono-config_rpm_requires.patch index 7b41712..3f342b5 100644 --- a/mono-config_rpm_requires.patch +++ b/mono-config_rpm_requires.patch @@ -105,7 +105,7 @@ Index: scripts/mono-find-requires.in + } + } + if(!ignore) { -+ print req"'$libext'" ++ system("rpm -q --whatprovides --queryformat \"%{NAME}\n\" ""\""req"'$libext'""\"") + } + } ' $i 2>/dev/null + done diff --git a/mono-core.changes b/mono-core.changes index 5cabec5..90c2b1e 100644 --- a/mono-core.changes +++ b/mono-core.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Jun 15 18:18:53 MST 2007 - wberrier@novell.com + +- mono-config_rpm_requires.patch: revert back to using package + requirements for the .config dep scanning. This is because + noarch packages can be built on either 32 or 64 bit machines, + and then otherwise will depend on a 32 or 64 bit library, which + is wrong. + ------------------------------------------------------------------- Tue Jun 5 15:18:53 MST 2007 - wberrier@novell.com diff --git a/mono-core.spec b/mono-core.spec index fca99f9..c7ad884 100644 --- a/mono-core.spec +++ b/mono-core.spec @@ -16,7 +16,7 @@ Group: Development/Languages/Other Summary: A .NET Runtime Environment URL: http://go-mono.org/ Version: 1.2.4 -Release: 1 +Release: 4 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: mono-%{version}.tar.bz2 Patch26: mono-r78768_ppc_pointer_cast.patch @@ -45,7 +45,7 @@ Provides: mono-ikvm Requires: libgdiplus %else # suse would rather have recommends so that all sorts of graphic libs aren't -# pulled in when organizing +# pulled in when libgdiplus is installed Recommends: libgdiplus %endif BuildRequires: bc glib2-devel @@ -1017,6 +1017,12 @@ rm -f ./usr/lib/mono/1.0/culevel.exe* rm -rf ${RPM_BUILD_ROOT} %changelog +* Fri Jun 15 2007 - wberrier@novell.com +- mono-config_rpm_requires.patch: revert back to using package + requirements for the .config dep scanning. This is because + noarch packages can be built on either 32 or 64 bit machines, + and then otherwise will depend on a 32 or 64 bit library, which + is wrong. * Tue Jun 05 2007 - wberrier@novell.com - Fix relevant rpmlint errors/warnings: -also 'provides' for each 'obsoletes'