Author: goetz
Date: Wed Feb 7 11:00:06 2007
New Revision: 117007
Added:
packages/cooker/mono/current/SOURCES/mono-1.2.3-mono-find.patch
- copied, changed from r116979,
/packages/cooker/mono/current/SOURCES/mono-1.1.8.1-mono-find.patch
packages/cooker/mono/current/SOURCES/mono-1.2.3.tar.bz2 (contents, props
changed)
Removed:
packages/cooker/mono/current/SOURCES/mono-1.1.8.1-mono-find.patch
packages/cooker/mono/current/SOURCES/mono-1.2.2.1.tar.bz2
Modified:
packages/cooker/mono/current/SOURCES/mono-dllmap.patch
packages/cooker/mono/current/SPECS/mono.spec
Log:
- new version
- rediff the patches
- update file list
Copied: packages/cooker/mono/current/SOURCES/mono-1.2.3-mono-find.patch (from
r116979, /packages/cooker/mono/current/SOURCES/mono-1.1.8.1-mono-find.patch)
==============================================================================
--- /packages/cooker/mono/current/SOURCES/mono-1.1.8.1-mono-find.patch
(original)
+++ packages/cooker/mono/current/SOURCES/mono-1.2.3-mono-find.patch Wed Feb
7 11:00:06 2007
@@ -1,20 +1,22 @@
---- mono-1.1.8.1/scripts/mono-find-provides.in.find 2005-06-06
20:52:08.000000000 +0200
-+++ mono-1.1.8.1/scripts/mono-find-provides.in 2005-06-23 22:33:30.000000000
+0200
-@@ -20,7 +20,6 @@
- [EMAIL PROTECTED]@
-
- [ -x $bindir/monodis ] || exit 0;
--[ -f $libdir/libmono.so ] || exit 0;
-
-
- # set LD_LIBRARY_PATH to ensure that libmono.so is found
---- mono-1.1.8.1/scripts/mono-find-requires.in.find 2005-06-06
20:52:08.000000000 +0200
-+++ mono-1.1.8.1/scripts/mono-find-requires.in 2005-06-23 22:32:35.000000000
+0200
-@@ -20,7 +20,6 @@
- [EMAIL PROTECTED]@
-
- [ -x $bindir/monodis ] || exit 0;
--[ -f $libdir/libmono.so ] || exit 0;
-
-
- # set LD_LIBRARY_PATH to ensure that libmono.so is found
+--- mono-1.2.3/scripts/mono-find-provides.in.find 2007-01-25
07:11:11.000000000 +0100
++++ mono-1.2.3/scripts/mono-find-provides.in 2007-02-07 09:49:37.000000000
+0100
+@@ -28,7 +28,7 @@
+ bindir=$d
+
+ # Bail out if monodis or libmono is missing
+-if [ ! -x $bindir/monodis ] || [ ! -f $libdir/libmono.so ] ; then
++if [ ! -x $bindir/monodis ] || [ ! -f $libdir/libmono.so.0 ] ; then
+ echo "monodis missing or unusable, exiting..."
+ exit 1
+ fi
+--- mono-1.2.3/scripts/mono-find-requires.in.find 2007-01-25
07:11:11.000000000 +0100
++++ mono-1.2.3/scripts/mono-find-requires.in 2007-02-07 09:49:23.000000000
+0100
+@@ -23,7 +23,7 @@
+ bindir=$d
+
+ # Bail out if monodis or libmono is missing
+-if [ ! -x $bindir/monodis ] || [ ! -f $libdir/libmono.so ] ; then
++if [ ! -x $bindir/monodis ] || [ ! -f $libdir/libmono.so.0 ] ; then
+ echo "monodis missing or unusable, exiting..."
+ exit 1
+ fi
Added: packages/cooker/mono/current/SOURCES/mono-1.2.3.tar.bz2
==============================================================================
Binary file. No diff available.
Modified: packages/cooker/mono/current/SOURCES/mono-dllmap.patch
==============================================================================
--- packages/cooker/mono/current/SOURCES/mono-dllmap.patch (original)
+++ packages/cooker/mono/current/SOURCES/mono-dllmap.patch Wed Feb 7
11:00:06 2007
@@ -1,21 +1,18 @@
---- mono-1.2/data/config.in.dllmap 2006-11-02 19:09:52.000000000 +0100
-+++ mono-1.2/data/config.in 2006-11-10 07:50:23.000000000 +0100
-@@ -3,14 +3,15 @@
- <dllmap dll="libc" target="@LIBC@" />
- <dllmap dll="intl" target="@INTL@" />
- <dllmap dll="libintl" target="@INTL@" />
-- <dllmap dll="libxslt.dll" target="[EMAIL PROTECTED]@" />
-- <dllmap dll="libmySQL.dll" target="[EMAIL PROTECTED]@" />
-- <dllmap dll="odbc32.dll" target="[EMAIL PROTECTED]@" />
-+ <dllmap dll="libxslt.dll" target="[EMAIL PROTECTED]@.1" />
-+ <dllmap dll="libmySQL.dll" target="[EMAIL PROTECTED]@.15" />
-+ <dllmap dll="odbc32.dll" target="[EMAIL PROTECTED]@.1" />
+--- mono-1.2.3/data/config.in.dllmap 2007-01-25 07:11:31.000000000 +0100
++++ mono-1.2.3/data/config.in 2007-02-07 09:45:26.000000000 +0100
+@@ -3,12 +3,13 @@
+ <dllmap dll="libc" target="@LIBC@" os="!windows"/>
+ <dllmap dll="intl" target="@INTL@" os="!windows"/>
+ <dllmap dll="libintl" target="@INTL@" os="!windows"/>
+- <dllmap dll="libxslt.dll" target="[EMAIL PROTECTED]@" os="!windows"/>
+- <dllmap dll="odbc32.dll" target="[EMAIL PROTECTED]@" os="!windows"/>
++ <dllmap dll="libxslt.dll" target="[EMAIL PROTECTED]@.1" os="!windows"/>
++ <dllmap dll="odbc32.dll" target="[EMAIL PROTECTED]@.1" os="!windows"/>
<dllmap os="osx" dll="odbc32.dll" target="libiodbc.dylib" />
<dllmap dll="oci" target="[EMAIL PROTECTED]@" os="!windows"/>
- <dllmap dll="db2cli" target="[EMAIL PROTECTED]@" />
- <dllmap dll="msvcrt" target="@LIBC@" />
- <dllmap dll="MonoPosixHelper" target="[EMAIL PROTECTED]@" />
-+ <dllmap dll="gdiplus.dll" target="libgdiplus.so.0"/>
- <dllmap dll="sqlite" target="@SQLITE@" />
- <dllmap dll="sqlite3" target="@SQLITE3@" />
- <dllmap dll="libX11" target="@X11@" />
+ <dllmap dll="db2cli" target="[EMAIL PROTECTED]@" os="!windows"/>
+ <dllmap dll="MonoPosixHelper" target="[EMAIL PROTECTED]@" os="!windows"
/>
++ <dllmap dll="gdiplus.dll" target="libgdiplus.so.0"/>
+ <dllmap dll="msvcrt" target="@LIBC@" os="!windows"/>
+ <dllmap dll="msvcrt.dll" target="@LIBC@" os="!windows"/>
+ <dllmap dll="sqlite" target="@SQLITE@" os="!windows"/>
Modified: packages/cooker/mono/current/SPECS/mono.spec
==============================================================================
--- packages/cooker/mono/current/SPECS/mono.spec (original)
+++ packages/cooker/mono/current/SPECS/mono.spec Wed Feb 7 11:00:06 2007
@@ -1,5 +1,5 @@
%define name mono
-%define version 1.2.2.1
+%define version 1.2.3
%define release %mkrel 1
%define major 0
@@ -19,9 +19,8 @@
Source0: http://www.go-mono.com/sources/%name/%name-%version.tar.bz2
#gw add some major numbers to the dll map to not depend on -devel packages
Patch: mono-dllmap.patch
-#gw make mono-find-* work without libmono.so installed #gw make
mono-find-* work without libmono.so installed
-#gw find dlls outside of gac too #gw find dlls outside of gac too
-Patch1: mono-1.1.8.1-mono-find.patch
+#gw make mono-find-* work without libmono.so installed
+Patch1: mono-1.2.3-mono-find.patch
URL: http://www.go-mono.com/
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: libglib2-devel >= 2.2.0
@@ -212,7 +211,7 @@
%files -n %libname
%defattr(-, root, root)
-%{_libdir}/*.so.*
+%{_libdir}/libmono*.so.%{major}*
# gw always check if they've got a valid soname
%_libdir/libMonoPosixHelper.so
%_libdir/libMonoSupportW.so
@@ -289,6 +288,8 @@
%monodir/2.0/mscorlib.dll
%monodir/2.0/*.exe
%monodir/2.0/*.mdb
+%monodir/2.0/MSBuild/
+%monodir/2.0/xbuild.rsp
%monodir/gac/Accessibility*
%monodir/gac/ByteFX.Data*
%monodir/gac/Commons.Xml.Relaxng*
@@ -316,18 +317,16 @@
%monodir/gac/cscompmgd*
%monodir/gac/mono-service/
%monodir/gac/nunit*
+%_datadir/mono-1.0/
%files -n %libname-devel
%defattr(-, root, root)
-%monodir/xbuild/
+%dir %_includedir/mono-1.0/
+%_includedir/mono-1.0/*
%{_libdir}/*.a
%attr(644,root,root) %{_libdir}/*.la
%{_libdir}/libmono*.so
%{_libdir}/pkgconfig/*
-%dir %{_includedir}/mono
-%{_includedir}/mono/*
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/*
%files -n jay
%defattr(-, root, root)
