Thu Aug 14 13:06:55 UTC 2008

Author: pfj

Update of /cvs/pkgs/rpms/mono/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8778/devel

Modified Files:
	.cvsignore mono-1.2.3-use-monodir.patch mono-libdir-126.patch 
	mono.spec sources 
Added Files:
	import.log mono-2.0-metadata-makefile.patch 
	mono-2.0-monoservice.patch mono-2.0-pcfiles.patch 
	mono-2.0-ppc-threading.patch mono-2.0-uselibdir.patch 
Removed Files:
	mono-1.1.13.4-ppc-threading.patch mono-1.2.4-metadata.patch 
	mono-1251-metadata.patch mono-191-pcfiles.patch 
Log Message:

Bump to 2.0 preview 1
Clean up of patch files
Spec file alterations
Probably a pile of other stuff I've forgotten as well!

--- NEW FILE import.log ---
mono-2_0-1_fc10:HEAD:mono-2.0-1.fc10.src.rpm:1218719116

mono-2.0-metadata-makefile.patch:

--- NEW FILE mono-2.0-metadata-makefile.patch ---
--- mono-2.0/mono/metadata/Makefile.am	2008-08-03 13:29:57.000000000 +0100
+++ mono-2.0/mono/metadata/Makefile-new.am	2008-08-03 15:50:47.000000000 +0100
@@ -9,7 +9,7 @@
 # optimisation is required to actually inline them
 AM_CFLAGS = -O
 else
-assembliesdir = $(exec_prefix)/lib
+assembliesdir = $(libdir)
 confdir = $(sysconfdir)
 endif
 
@@ -21,7 +21,7 @@
 #
 noinst_LTLIBRARIES = libmonoruntime.la libmonoruntime-static.la
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CFLAGS) $(GLIB_CFLAGS) -DMONO_BINDIR=\"$(bindir)/\" -DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_CFG_DIR=\"$(confdir)\"
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CFLAGS) $(GLIB_CFLAGS) $(GMODULE_CFLAGS) -DMONO_BINDIR=\"$(bindir)/\" -DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_RELOC_LIBDIR=\"$(reloc_libdir)\" -DMONO_CFG_DIR=\"$(confdir)\"
 
 #
 # Make sure any prefix changes are updated in the binaries too.

mono-2.0-monoservice.patch:

--- NEW FILE mono-2.0-monoservice.patch ---
--- mono-2.0/scripts/mono-service.in	2008-08-03 08:12:55.000000000 +0100
+++ mono-2.0/scripts/mono-service-new.in	2008-08-03 08:17:46.000000000 +0100
@@ -35,7 +35,7 @@
 
 export MONO_DISABLE_SHM=1
 if $debug; then
-   exec @bindir@/@mono_interp@ $MONO_OPTIONS @mono_instdir@/@framework_version@/mono-service.exe $args
+   exec @bindir@/@mono_interp@ $MONO_OPTIONS `@bindir@/monodir`/@framework_version@/mono-service.exe $args
 else
-   exec @bindir@/@mono_interp@ $MONO_OPTIONS @mono_instdir@/@framework_version@/mono-service.exe $args </dev/null >/dev/null 2>&1 &
+   exec @bindir@/@mono_interp@ $MONO_OPTIONS `@bindir@/monodir`/@framework_version@/@exe_name at .exe $args </dev/null > /dev/null 2>&1 &
 fi

mono-2.0-pcfiles.patch:

--- NEW FILE mono-2.0-pcfiles.patch ---
--- mono-2.0/data/cecil.pc.in	2008-07-01 18:51:06.000000000 +0100
+++ mono-2.0/data/cecil.pc-new.in	2008-08-03 16:00:19.000000000 +0100
@@ -1,4 +1,4 @@
-assemblies_dir=@prefix@/lib/mono
+assemblies_dir=@libdir@/mono
 Libraries=${assemblies_dir}/gac/Mono.Cecil/0.6.8.8607__0738eb9f132ed756/Mono.Cecil.dll
 
 Name: Mono Internal -- Do not use.
--- mono-2.0/data/mint.pc.in	2008-07-01 18:51:07.000000000 +0100
+++ mono-2.0/data/mint.pc-new.in	2008-08-03 16:00:07.000000000 +0100
@@ -1,6 +1,6 @@
 prefix=${pcfiledir}/../..
 exec_prefix=${pcfiledir}/../..
-libdir=${prefix}/lib
+libdir=@libdir@
 includedir=${prefix}/include/mono- at API_VER@
 
 
--- mono-2.0/data/mono-cairo.pc.in	2008-08-03 15:59:34.000000000 +0100
+++ mono-2.0/data/mono-cairo.pc-new.in	2008-08-03 15:59:55.000000000 +0100
@@ -1,6 +1,6 @@
 prefix=${pcfiledir}/../..
 exec_prefix=${pcfiledir}/../..
-libdir=${prefix}/@reloc_libdir@
+libdir=@libdir@
 includedir=${prefix}/include
 
 Name: Mono.Cairo
--- mono-2.0/data/mono.pc.in	2008-07-01 18:51:07.000000000 +0100
+++ mono-2.0/data/mono.pc-new.in	2008-08-03 15:59:18.000000000 +0100
@@ -1,6 +1,6 @@
 prefix=${pcfiledir}/../..
 exec_prefix=${pcfiledir}/../..
-libdir=${prefix}/@reloc_libdir@
+libdir=@libdir@
 includedir=${prefix}/include/mono- at API_VER@
 sysconfdir=@sysconfdir@
 
--- mono-2.0/data/smcs.pc.in	2008-07-15 18:24:01.000000000 +0100
+++ mono-2.0/data/smcs.pc-new.in	2008-08-03 15:59:02.000000000 +0100
@@ -1,4 +1,4 @@
-assemblies_dir=@prefix@/lib/mono
+assemblies_dir=@libdir@/mono
 Libraries=${assemblies_dir}/2.1/smcs.exe
 
 Name: Mono Internal -- Do not use.

mono-2.0-ppc-threading.patch:

--- NEW FILE mono-2.0-ppc-threading.patch ---
--- mono-2.0/mono/mini/main.c	2008-08-03 07:49:23.000000000 +0100
+++ mono-2.0/mono/mini/main-new.c	2008-08-03 07:55:10.000000000 +0100
@@ -23,10 +23,16 @@
 }
 
 #else
-
+#include <sched.h>
 int
 main (int argc, char* argv[])
 {
+    /* On PowerPC call sched_setaffinity to bind to one CPU only
+     * to work around parallelism bug on G5 SMP */
+    #ifdef __powerpc__
+    unsigned long mask = 1;
+    sched_setaffinity(0, sizeof(mask), &mask);
+    #endif
 	return mono_main (argc, argv);
 }
 

mono-2.0-uselibdir.patch:

--- NEW FILE mono-2.0-uselibdir.patch ---
--- mono-2.0/mcs/class/Microsoft.Build.Utilities/Mono.XBuild.Utilities/MonoLocationHelper.cs	2008-08-03 07:58:47.000000000 +0100
+++ mono-2.0/mcs/class/Microsoft.Build.Utilities/Mono.XBuild.Utilities/MonoLocationHelper-new.cs	2008-08-03 08:06:47.000000000 +0100
@@ -53,10 +53,10 @@
 			//xbuildDir = Path.Combine (t2.FullName, "xbuild");
 			// /usr/local/lib
 			t3 = t2.Parent;
+			libDir = t3.FullName;
 			// /usr/local
 			t4 = t3.Parent;
 			binDir = Path.Combine (t4.FullName, "bin");
-			libDir = Path.Combine (t4.FullName, "lib");
 		}
 	
 		internal static string GetBinDir ()


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	16 Apr 2008 21:16:44 -0000	1.20
+++ .cvsignore	14 Aug 2008 13:06:25 -0000	1.21
@@ -1 +1 @@
-mono-1.9.1.tar.bz2
+mono-2.0.tar.bz2

mono-1.2.3-use-monodir.patch:

Index: mono-1.2.3-use-monodir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/mono-1.2.3-use-monodir.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mono-1.2.3-use-monodir.patch	21 Feb 2008 12:04:54 -0000	1.2
+++ mono-1.2.3-use-monodir.patch	14 Aug 2008 13:06:25 -0000	1.3
@@ -12,15 +12,3 @@
  umask 077
 -exec @bindir@/@mono_interp@ $MONO_OPTIONS @mono_instdir@/@framework_version@/@exe_name at .exe "$@"
 +exec @bindir@/@mono_interp@ $MONO_OPTIONS `@bindir@/monodir`/@framework_version@/@exe_name at .exe "$@"
---- mono-1.9/scripts/mono-service.in	2008-02-06 21:43:22.000000000 +0000
-+++ mono-1.9/scripts/mono-service-new.in	2008-02-06 21:47:55.000000000 +0000
-@@ -35,7 +35,7 @@
- 
- export MONO_DISABLE_SHM=1
- if $debug; then
--   exec @bindir@/@mono_interp@ $MONO_OPTIONS @mono_instdir@/@framework_version@/mono-service.exe $args
-+   exec @bindir@/@mono_interp@ $MONO_OPTIONS `@bindir@/monodir`/@framework_version@/mono-service.exe $args
- else
--   exec @bindir@/@mono_interp@ $MONO_OPTIONS @mono_instdir@/@framework_version@/mono-service.exe $args </dev/null > /dev/null 2>&1 &
-+   exec @bindir@/@mono_interp@ $MONO_OPTIONS `@bindir@/monodir`/@framework_version@/@exe_name at .exe $args </dev/null > /dev/null 2>&1 &
- fi

mono-libdir-126.patch:

Index: mono-libdir-126.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/mono-libdir-126.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mono-libdir-126.patch	17 Dec 2007 00:59:27 -0000	1.1
+++ mono-libdir-126.patch	14 Aug 2008 13:06:25 -0000	1.2
@@ -89,17 +89,3 @@
  				return dir;
  			return Path.Combine (dir, "lib");
  		}
---- mono-1.1.16.1/mcs/class/Microsoft.Build.Utilities/Mono.XBuild.Utilities/MonoLocationHelper.cs.libdir	2006-08-17 15:46:11.000000000 +0200
-+++ mono-1.1.16.1/mcs/class/Microsoft.Build.Utilities/Mono.XBuild.Utilities/MonoLocationHelper.cs	2006-08-17 15:46:53.000000000 +0200
-@@ -53,10 +53,10 @@
- 			xbuildDir = Path.Combine (t2.FullName, "xbuild");
- 			// /usr/local/lib
- 			t3 = t2.Parent;
-+			libDir = t3.FullName;
- 			// /usr/local
- 			t4 = t3.Parent;
- 			binDir = Path.Combine (t4.FullName, "bin");
--			libDir = Path.Combine (t4.FullName, "lib");
- 		}
- 	
- 		public static string GetBinDir ()


Index: mono.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/mono.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- mono.spec	23 Apr 2008 08:39:14 -0000	1.74
+++ mono.spec	14 Aug 2008 13:06:25 -0000	1.75
@@ -1,10 +1,10 @@
 Name:		mono
-Version:        1.9.1
-Release:        2%{?dist}
+Version:        2.0
+Release:        1%{?dist}
 Summary:        A .NET runtime environment
 
 Group:          Development/Languages
-License:        GPLv2 and LGPLv2+ and MIT
+License:        MIT
 URL:            http://go-mono.com/sources-stable/%{name}-%{version}.tar.bz2
 Source0:        %{name}-%{version}.tar.bz2
 Source1:	monodir.c
@@ -14,7 +14,7 @@
 BuildRequires:  glib2-devel
 BuildRequires:  pkgconfig
 BuildRequires:  libicu-devel
-BuildRequires:  libgdiplus-devel >= 1.2.6
+BuildRequires:  libgdiplus-devel >= 2.0
 BuildRequires:  zlib-devel
 %ifarch ia64
 BuildRequires:  libunwind
@@ -35,14 +35,15 @@
 # s390 s390x
 
 Patch1: mono-1.1.13.4-selinux-ia64.patch
-Patch2: mono-1.1.13.4-ppc-threading.patch
+Patch2: mono-2.0-ppc-threading.patch
 Patch3: mono-libdir-126.patch
 Patch4: mono-1.2.3-use-monodir.patch
-Patch5: mono-1.2.4-metadata.patch
-Patch6: mono-1251-metadata.patch
-Patch7: mono-big-integer-CVE-2007-5197.patch
+Patch5: mono-big-integer-CVE-2007-5197.patch
 Patch8: mono-mcs-config.patch
-Patch9: mono-191-pcfiles.patch
+Patch7: mono-2.0-pcfiles.patch
+Patch6:mono-2.0-uselibdir.patch
+Patch9:mono-2.0-monoservice.patch
+Patch10: mono-2.0-metadata-makefile.patch
 
 %description
 The Mono runtime implements a JIT engine for the ECMA CLI
@@ -252,12 +253,12 @@
 sed -i -e 's!%{_libdir}!@@LIBDIR@@!' %{PATCH8}
 %patch1 -p1 -b .selinux-ia64
 %patch2 -p1 -b .ppc-threading
-%patch5 -p1 -b .monodir
 %patch3 -p1 -b .libdir
 %patch4 -p1 -b .use-monodir
-%patch6 -p1 -b .metadata
-%patch7 -p0 -b .big-integer
-%patch9 -p1 -b .original
+%patch6 -p1 -b .use-libdir
+%patch7 -p1 -b .pc-patches
+%patch9 -p1 -b .monoservice
+%patch10 -p1 -b .metadata
 autoreconf -f -i -s
 
 # Add undeclared Arg
@@ -292,8 +293,6 @@
 %{__rm} $RPM_BUILD_ROOT%{_bindir}/mono-find-provides
 %{__rm} $RPM_BUILD_ROOT%{_bindir}/mono-find-requires
 
-%{__rm} $RPM_BUILD_ROOT%{_bindir}/mbas
-
 # This was removed upstream:
 %{__rm} -fr $RPM_BUILD_ROOT%{monodir}/gac/Mono.Security.Win32/[12]*
 %{__rm} -rf $RPM_BUILD_ROOT%{monodir}/1.0/Mono.Security.Win32.dll
@@ -337,6 +336,7 @@
 %mono_bin gacutil
 %mono_bin gmcs
 %mono_bin mcs
+%{_bindir}/mcs1
 %mono_bin mozroots
 %mono_bin mconfig
 %mono_bin setreg
@@ -349,11 +349,10 @@
 %{monodir}/2.1/smcs*
 %{monodir}/2.1/mscorlib*
 %{monodir}/3.5/System.Web.Extensions*
-%{monodir}/3.5/System.Xml.Linq.dll
+%{monodir}/2.0/System.Xml.Linq.dll
 %{_bindir}/mkbundle2
 %{_libdir}/libmono.so.*
-%{_libdir}/libMonoPosixHelper.so
-%{_libdir}/libMonoSupportW.so
+%{_libdir}/libmono-profiler-logging.so.*
 %{_mandir}/man1/certmgr.1.gz
 %{_mandir}/man1/chktrust.1.gz
 %{_mandir}/man1/gacutil.1.gz
@@ -384,7 +383,6 @@
 %gac_dll Mono.Cairo
 %{monodir}/gac/Mono.Cecil
 %{monodir}/gac/Mono.Cecil.Mdb
-%gac_dll Mono.Mozilla
 %gac_dll Mono.CompilerServices.SymbolWriter
 %gac_dll Mono.GetOptions
 %gac_dll Mono.Posix
@@ -395,10 +393,11 @@
 %gac_dll System.Security
 %gac_dll System.Xml
 %gac_dll System.Core
+%{monodir}/gac/System.Net
 %gac_dll cscompmgd
 %gac_dll CustomMarshalers
 %gac_dll OpenSystem.C
-%{monodir}/gac/System.Xml.Core
+#%{monodir}/gac/System.Xml.Core
 %{monodir}/gac/System.Xml.Linq
 %{monodir}/?.0/mscorlib.dll
 %{monodir}/?.0/mscorlib.dll.mdb
@@ -410,8 +409,7 @@
 %config (noreplace) %{_sysconfdir}/mono/2.0/machine.config
 %config (noreplace) %{_sysconfdir}/mono/mconfig/config.xml
 %config (noreplace) %{_sysconfdir}/mono/2.0/settings.map
-%{_libdir}/libikvm-native.so
-%mono_bin httpcfg
+
 
 %files devel
 %defattr(-,root,root,-)
@@ -419,25 +417,32 @@
 %{_bindir}/pedump
 %mono_bin_1 al al
 %mono_bin_2 al2 al
+%{_bindir}/al1
 %mono_bin caspol
 %mono_bin cert2spc
 %mono_bin cilc
 %mono_bin dtd2xsd
 %mono_bin dtd2rng
-%mono_bin genxs
+%mono_bin_1 genxs1 genxs
+%{_bindir}/genxs
+%{_bindir}/genxs2
 %mono_bin sgen
 %mono_bin_1 ilasm ilasm
+%{_bindir}/ilasm1
 %mono_bin_2 ilasm2 ilasm
 %mono_bin macpack
 %mono_bin makecert
 %mono_bin mkbundle
+%{_bindir}/mkbundle1
 %mono_bin_1 monop monop
+%{_bindir}/monop1
 %mono_bin_2 monop2 monop
 %mono_bin mono-shlib-cop
 %mono_bin mono-xmltool
 %mono_bin permview
 %mono_bin prj2make
 %mono_bin_1 resgen resgen
+%{_bindir}/resgen1
 %mono_bin_2 resgen2 resgen
 %mono_bin secutil
 %mono_bin signcode
@@ -477,10 +482,16 @@
 %{_libdir}/libmono-profiler-aot.*
 %{_libdir}/libmono-profiler-cov.*
 %{_libdir}/libmono.so
+%{_libdir}/libMonoPosixHelper.so
+%{_libdir}/libMonoSupportW.so
+%{_libdir}/libmono-profiler-logging.so
+%{_libdir}/libikvm-native.so
 %{_libdir}/pkgconfig/dotnet.pc
 %{_libdir}/pkgconfig/mono-cairo.pc
 %{_libdir}/pkgconfig/mono.pc
 %{_libdir}/pkgconfig/cecil.pc
+%{_libdir}/pkgconfig/dotnet35.pc
+%{_libdir}/pkgconfig/smcs.pc
 %{_includedir}/mono-1.0
 %{_datadir}/mono-1.0/mono/cil/cil-opcodes.xml
 %dir %{_datadir}/mono-1.0
@@ -537,6 +548,7 @@
 %defattr(-,root,root,-)
 %gac_dll Mono.Http
 %gac_dll Mono.Web
+%gac_dll Mono.WebBrowser
 %gac_dll System.Runtime.Remoting
 %gac_dll System.Web
 %gac_dll System.Runtime.Serialization.Formatters.Soap
@@ -546,13 +558,16 @@
 %mono_bin disco
 %mono_bin soapsuds
 %mono_bin_1 wsdl wsdl
+%{_bindir}/wsdl1
 %mono_bin_2 wsdl2 wsdl
-%mono_bin xsd
+%mono_bin_2 xsd2 xsd
+%mono_bin_1 xsd xsd
 %{_mandir}/man1/disco.1.gz
 %{_mandir}/man1/soapsuds.1.gz
 %{_mandir}/man1/wsdl.1.gz
 %{_mandir}/man1/xsd.1.gz
 %config (noreplace) %{_sysconfdir}/mono/browscap.ini
+%config (noreplace) %{_sysconfdir}/mono/2.0/Browsers/Compat.browser
 %config (noreplace) %{_sysconfdir}/mono/1.0/DefaultWsdlHelpGenerator.aspx
 %config (noreplace) %{_sysconfdir}/mono/2.0/DefaultWsdlHelpGenerator.aspx
 %config (noreplace) %{_sysconfdir}/mono/2.0/web.config
@@ -564,6 +579,8 @@
 %mono_bin sqlsharp
 %{_mandir}/man1/sqlsharp.1.gz
 %gac_dll System.Data
+%gac_dll System.Data.DataSetExtensions
+%gac_dll System.Data.Linq
 %gac_dll Mono.Data
 %gac_dll Mono.Data.Tds
 %gac_dll Mono.Data.TdsClient
@@ -602,6 +619,12 @@
 %gac_dll IBM.Data.DB2
 
 %changelog
+* Sat Aug 02 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-1
+- bump to 2.0 preview 1
+- alter licence to MIT only
+- renamed and clean up patch files
+- spec file fixes
+
 * Mon Apr 21 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.9.1-2
 - pc file fixes
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	16 Apr 2008 21:16:44 -0000	1.21
+++ sources	14 Aug 2008 13:06:25 -0000	1.22
@@ -1 +1 @@
-8ef33f12749695124b4b7cd40fbb7da7  mono-1.9.1.tar.bz2
+16d986b04634d2022cf5747f01387744  mono-2.0.tar.bz2


--- mono-1.1.13.4-ppc-threading.patch DELETED ---


--- mono-1.2.4-metadata.patch DELETED ---


--- mono-1251-metadata.patch DELETED ---


--- mono-191-pcfiles.patch DELETED ---


