OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mono-core?expand=0&rev=8

mono-core.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jul 05 20:03:53 MST 2007 - wberrier@novell.com
+
+- mono-find-requires fixes for ia64 (bnc #282877)
+
 -------------------------------------------------------------------
 Wed Jun 20 13:08:33 CEST 2007 - ro@suse.de
 

mono-core.spec

@@ -11,17 +11,19 @@
 # norootforbuild
 
 Name:           mono-core
-License:        GNU Library General Public License v. 2.0 and 2.1 (LGPL)
+License:        LGPL v2 or later
-Group:          Development/Languages/Other
+Group:          Development/Languages/Mono
 Summary:        A .NET Runtime Environment
 URL:            http://go-mono.org/
 Version:        1.2.4
-Release:        5
+Release:        7
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source0:        mono-%{version}.tar.bz2
 Patch26:        mono-r78768_ppc_pointer_cast.patch
 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
 ExclusiveArch: %ix86 x86_64 ppc hppa armv4l sparc s390 ia64 s390x
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Provides:       mono = %{version}-%{release}
@@ -33,13 +35,11 @@ Obsoletes:      mono-xml-relaxng
 Obsoletes:      mono-posix
 Obsoletes:      mono-ziplib
 Obsoletes:      mono-ikvm
-Provides:       mono
 Provides:       mono-drawing
 Provides:       mono-cairo
 Provides:       mono-xml-relaxng
 Provides:       mono-posix
 Provides:       mono-ziplib
-Provides:       mono-ikvm
 # Require when in the buildserivce
 %if 0%{?opensuse_bs}
 Requires:       libgdiplus
@@ -214,7 +214,7 @@ fi
 /sbin/ldconfig
 %package -n mono-jscript
 Summary:        JScript .NET support for Mono
-Group:          Development/Languages/Other
+Group:          Development/Languages/Mono
 Requires:       mono-core == %version-%release
 
 %description -n mono-jscript
@@ -240,7 +240,7 @@ Authors:
 %_prefix/lib/mono/2.0/Microsoft.JScript.dll
 %package -n mono-locale-extras
 Summary:        Extra locale information
-Group:          Development/Languages/Other
+Group:          Development/Languages/Mono
 Requires:       mono-core == %version-%release
 
 %description -n mono-locale-extras
@@ -277,7 +277,7 @@ Authors:
 %_prefix/lib/mono/2.0/I18N.Other.dll
 %package -n mono-data
 Summary:        Database connectivity for Mono
-Group:          Development/Languages/Other
+Group:          Development/Languages/Mono
 Requires:       mono-core == %version-%release
 Obsoletes:      mono-ms-enterprise
 Obsoletes:      mono-novell-directory
@@ -334,7 +334,7 @@ Authors:
 %_prefix/lib/mono/2.0/System.Transactions.dll
 %package -n mono-winforms
 Summary:        Mono's Windows Forms implementation
-Group:          Development/Languages/Other
+Group:          Development/Languages/Mono
 Requires:       mono-core == %version-%release
 Provides:       mono-window-forms
 Obsoletes:      mono-window-forms
@@ -373,7 +373,7 @@ Authors:
 %_prefix/lib/mono/2.0/System.Drawing.Design.dll
 %package -n ibm-data-db2
 Summary:        Database connectivity for DB2
-Group:          Development/Languages/Other
+Group:          Development/Languages/Mono
 Requires:       mono-core == %version-%release
 
 %description -n ibm-data-db2
@@ -400,7 +400,7 @@ Authors:
 %_prefix/lib/mono/1.0/IBM.Data.DB2.dll
 %package -n mono-extras
 Summary:        Extra packages
-Group:          Development/Languages/Other
+Group:          Development/Languages/Mono
 Requires:       mono-core == %version-%release
 Obsoletes:      mono-ms-extras
 Provides:       mono-ms-extras
@@ -428,6 +428,7 @@ Authors:
 %_mandir/man1/mono-service.1.gz
 %_bindir/mono-service
 %_bindir/mono-service2
+# These are errors because they should be symlinks, but they are copies, so rpmlint detects duplicate files
 %_prefix/lib/mono/gac/mono-service
 %_prefix/lib/mono/1.0/mono-service.exe*
 %_prefix/lib/mono/2.0/mono-service.exe*
@@ -448,7 +449,7 @@ Authors:
 %_prefix/lib/mono/2.0/Microsoft.Vsa.dll
 %package -n mono-data-sqlite
 Summary:        Database connectivity for Mono
-Group:          Development/Languages/Other
+Group:          Development/Languages/Mono
 Requires:       mono-core == %version-%release
 Requires:       mono-data == %version-%release
 Requires:       sqlite2
@@ -481,7 +482,7 @@ Authors:
 %_prefix/lib/mono/2.0/Mono.Data.Sqlite.dll
 %package -n mono-data-sybase
 Summary:        Database connectivity for Mono
-Group:          Development/Languages/Other
+Group:          Development/Languages/Mono
 Requires:       mono-core == %version-%release
 Requires:       mono-data == %version-%release
 
@@ -510,7 +511,7 @@ Authors:
 %_prefix/lib/mono/2.0/Mono.Data.SybaseClient.dll
 %package -n mono-web
 Summary:        Mono implementation of ASP.NET, Remoting and Web Services
-Group:          Development/Languages/Other
+Group:          Development/Languages/Mono
 Requires:       mono-core == %version-%release
 Obsoletes:      mono-web-forms
 Obsoletes:      mono-web-services
@@ -577,7 +578,7 @@ Authors:
 %config /etc/mono/2.0/web.config
 %package -n mono-data-oracle
 Summary:        Database connectivity for Mono
-Group:          Development/Languages/Other
+Group:          Development/Languages/Mono
 Requires:       mono-core == %version-%release
 Requires:       mono-data == %version-%release
 
@@ -606,7 +607,7 @@ Authors:
 %_prefix/lib/mono/2.0/System.Data.OracleClient.dll
 %package -n mono-data-postgresql
 Summary:        Database connectivity for Mono
-Group:          Development/Languages/Other
+Group:          Development/Languages/Mono
 Requires:       mono-core == %version-%release
 Requires:       mono-data == %version-%release
 
@@ -635,7 +636,7 @@ Authors:
 %_prefix/lib/mono/2.0/Npgsql.dll
 %package -n bytefx-data-mysql
 Summary:        Database connectivity for Mono
-Group:          Development/Languages/Other
+Group:          Development/Languages/Mono
 Requires:       mono-core == %version-%release
 Requires:       mono-data == %version-%release
 
@@ -664,13 +665,13 @@ Authors:
 %_prefix/lib/mono/2.0/ByteFX.Data.dll
 %package -n mono-nunit
 Summary:        NUnit Testing Framework
-Group:          Development/Languages/Other
+Group:          Development/Languages/Mono
 Requires:       mono-core == %version-%release
 # No idea why this Requires is here... removing (bnc #210224)
 #Requires:       glib2-devel
 %package -n mono-data-firebird
 Summary:        Database connectivity for Mono
-Group:          Development/Languages/Other
+Group:          Development/Languages/Mono
 Requires:       mono-core == %version-%release
 Requires:       mono-data == %version-%release
 
@@ -727,7 +728,7 @@ Authors:
 %_libdir/pkgconfig/mono-nunit.pc
 %package -n mono-devel
 Summary:        Mono development tools
-Group:          Development/Languages/Other
+Group:          Development/Languages/Mono
 Requires:       mono-core == %version-%release
 Requires:       glib2-devel
 
@@ -883,10 +884,9 @@ Authors:
 #  yet gzipped
 %package -n mono-complete
 Summary:        A .NET Runtime Environment
-Group:          Development/Languages/Other
+Group:          Development/Languages/Mono
 Requires:       bytefx-data-mysql = %version-%release
 Requires:       ibm-data-db2 = %version-%release
-Requires:       mono-basic = %version
 Requires:       mono-core = %version-%release
 Requires:       mono-data = %version-%release
 Requires:       mono-data-oracle = %version-%release
@@ -894,7 +894,6 @@ Requires:       mono-data-postgresql = %version-%release
 Requires:       mono-data-sqlite = %version-%release
 Requires:       mono-data-sybase = %version-%release
 Requires:       mono-extras = %version-%release
-Requires:       mono-ikvm = %version-%release
 Requires:       mono-locale-extras = %version-%release
 Requires:       mono-web = %version-%release
 Requires:       mono-winforms = %version-%release
@@ -926,6 +925,8 @@ Authors:
 %patch26
 %patch28
 %patch29
+%patch30
+%patch31
 
 %build
 # What's this for?
@@ -1017,6 +1018,8 @@ rm -f ./usr/lib/mono/1.0/culevel.exe*
 rm -rf ${RPM_BUILD_ROOT}
 
 %changelog
+* Thu Jul 05 2007 - wberrier@novell.com
+- mono-find-requires fixes for ia64 (bnc #282877)
 * Wed Jun 20 2007 - ro@suse.de
 - removed requires on specific release in mono-complete for
   mono-basic (not a subpackage of mono-core anymore)

mono-r77377_fix_ia64_find-requires.patch

@@ -0,0 +1,10 @@
+Index: mcs/tools/mono-shlib-cop/mono-shlib-cop.exe.config
+===================================================================
+--- mcs/tools/mono-shlib-cop/mono-shlib-cop.exe.config	(revision 77376)
++++ mcs/tools/mono-shlib-cop/mono-shlib-cop.exe.config	(revision 77377)
+@@ -1,5 +1,4 @@
+ <configuration>
+-	<dllmap dll="does-not-exist" target="libc.so.6"/>
+ 	<dllmap dll="libgmodule-2.0.so" target="libgmodule-2.0.so.0"/>
+ 	<dllmap dll="libglib-2.0.so" target="libglib-2.0.so.0"/>
+ </configuration>

mono-r81450_fix_ia64_find-requires.patch

@@ -0,0 +1,21 @@
+Index: scripts/mono-find-requires.in
+===================================================================
+--- scripts/mono-find-requires.in	(revision 81444)
++++ scripts/mono-find-requires.in	(working copy)
+@@ -33,9 +33,16 @@
+ if test "x@reloc_libdir@" = "xlib64" ; then
+         libext="()(64bit)"
+ else
++	# (note, this works on ppc64 since we only have 32bit mono
+         libext=""
+ fi
+ 
++# Exceptions:
++case `uname -m` in
++	# ia64 doesn't use lib64 for 'libdir' (sles 9 rpm used to provide both... no longer)
++	ia64)	libext="()(64bit)" ;;
++esac
++
+ # set LD_LIBRARY_PATH to ensure that libmono.so is found
+ export LD_LIBRARY_PATH=$libdir${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+