diff --git a/mono-core.changes b/mono-core.changes index 3135521..7b2b683 100644 --- a/mono-core.changes +++ b/mono-core.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Mon Jul 30 12:16:15 CEST 2007 - ro@suse.de - -- try to use 64bit libs on ppc64 as well in find-requires - ------------------------------------------------------------------- Tue Jul 05 20:03:53 MST 2007 - wberrier@novell.com diff --git a/mono-core.spec b/mono-core.spec index 3338ca7..b767cf3 100644 --- a/mono-core.spec +++ b/mono-core.spec @@ -16,7 +16,7 @@ Group: Development/Languages/Mono Summary: A .NET Runtime Environment URL: http://go-mono.org/ Version: 1.2.4 -Release: 15 +Release: 16 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: mono-%{version}.tar.bz2 Patch26: mono-r78768_ppc_pointer_cast.patch @@ -24,7 +24,6 @@ Patch28: mono-config_rpm_requires.patch Patch29: mono-provides_fix_r76875.patch Patch30: mono-r77377_fix_ia64_find-requires.patch Patch31: mono-r81450_fix_ia64_find-requires.patch -Patch32: mono-ppc64_find-requires.patch ExclusiveArch: %ix86 x86_64 ppc hppa armv4l sparc s390 ia64 s390x BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: mono = %{version}-%{release} @@ -928,7 +927,6 @@ Authors: %patch29 %patch30 %patch31 -%patch32 %build # What's this for? @@ -1020,8 +1018,6 @@ rm -f ./usr/lib/mono/1.0/culevel.exe* rm -rf ${RPM_BUILD_ROOT} %changelog -* Mon Jul 30 2007 - ro@suse.de -- try to use 64bit libs on ppc64 as well in find-requires * Thu Jul 05 2007 - wberrier@novell.com - mono-find-requires fixes for ia64 (bnc #282877) * Wed Jun 20 2007 - ro@suse.de diff --git a/mono-ppc64_find-requires.patch b/mono-ppc64_find-requires.patch deleted file mode 100644 index b91aefd..0000000 --- a/mono-ppc64_find-requires.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- scripts/mono-find-requires.in -+++ scripts/mono-find-requires.in -@@ -40,7 +40,8 @@ - # Exceptions: - case `uname -m` in - # ia64 doesn't use lib64 for 'libdir' (sles 9 rpm used to provide both... no longer) -- ia64) libext="()(64bit)" ;; -+ # ppc64 more likely has the 64bit libs installed -+ ia64|ppc64) libext="()(64bit)" ;; - esac - - # set LD_LIBRARY_PATH to ensure that libmono.so is found