rpms/mono/devel mono-242-metadata-appconf.patch, NONE, 1.1 import.log, 1.47, 1.48 mono.spec, 1.131, 1.132

[Paul F. Johnson]

Author: pfj

Update of /cvs/pkgs/rpms/mono/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13260/devel

Modified Files:
	import.log mono.spec 
Added Files:
	mono-242-metadata-appconf.patch 
Log Message:

Add appconf patch for metadata
Fixes for BZ 434709 


mono-242-metadata-appconf.patch:

--- NEW FILE mono-242-metadata-appconf.patch ---
--- mono-2.4.2/mono/metadata/Makefile.in	2009-06-08 18:34:04.000000000 +0100
+++ mono-2.4.2/mono/metadata/Makefile-new.in	2009-06-14 14:41:11.000000000 +0100
@@ -443,7 +443,6 @@
 	object.h	\
 	exception.h	\
 	profiler.h	\
-	appdomain.h	\
 	mono-config.h	\
 	debug-helpers.h	\
 	mempool.h
--- mono-2.4.2/mono/metadata/Makefile.am	2009-06-14 16:52:07.000000000 +0100
+++ mono-2.4.2/mono/metadata/Makefile-new.am	2009-06-14 17:18:50.000000000 +0100
@@ -171,7 +171,6 @@
 	object.h	\
 	exception.h	\
 	profiler.h	\
-	appdomain.h	\
 	mono-config.h	\
 	debug-helpers.h	\
 	mempool.h


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/import.log,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- import.log	14 Jun 2009 11:33:24 -0000	1.47
+++ import.log	14 Jun 2009 16:48:02 -0000	1.48
@@ -45,3 +45,4 @@ mono-2_4-12_1_fc11:HEAD:mono-2.4-12.1.fc
 mono-2_4-13_1_fc11:HEAD:mono-2.4-13.1.fc11.src.rpm:1239097233
 mono-2_4-13_2_fc11:HEAD:mono-2.4-13.2.fc11.src.rpm:1239456192
 mono-2_4_2-1_fc11:HEAD:mono-2.4.2-1.fc11.src.rpm:1244979134
+mono-2_4_2-2_fc12:HEAD:mono-2.4.2-2.fc12.src.rpm:1244998030


Index: mono.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/mono.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -p -r1.131 -r1.132
--- mono.spec	14 Jun 2009 11:33:25 -0000	1.131
+++ mono.spec	14 Jun 2009 16:48:03 -0000	1.132
@@ -1,6 +1,6 @@
 Name:           mono
 Version:        2.4.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A .NET runtime environment
 
 Group:          Development/Languages
@@ -44,6 +44,7 @@ Patch4: mono-2.0-monoservice.patch
 Patch5: mono-2.0-metadata-makefile.patch
 Patch6: mono-22-libgdiwinform.patch
 Patch7: mono-22-libdir.patch
+Patch8: mono-242-metadata-appconf.patch
 
 %description
 The Mono runtime implements a JIT engine for the ECMA CLI
@@ -288,6 +289,7 @@ mono-moonlight are all the parts require
 %patch3 -p1 -b .uselibdir
 %patch4 -p1 -b .monoservice
 %patch5 -p1 -b .metadata-makefile
+%patch8 -p1 -b .metadata-appconf
 %patch6 -p1 -b .libgdiplus
 sed -i -e 's!@libdir@!%{_libdir}!' %{PATCH7}
 %patch7 -p1 -b .libdir-22
@@ -435,9 +437,18 @@ install monodir %{buildroot}%{_bindir}
 %gac_dll System.Security
 %gac_dll System.Xml
 %gac_dll System.Core
+%gac_dll System.Configuration.Install
 %gac_dll Mono.CSharp
 %gac_dll Mono.Management
 %gac_dll Mono.Simd
+%gac_dll System.Web
+%gac_dll System.Web.Abstractions
+%gac_dll System.Web.DynamicData
+%gac_dll System.Web.Routing
+%gac_dll System.Web.Services
+%gac_dll System.Web.Extensions.Design
+%gac_dll System.Web.Extensions
+%{monodir}/compat-2.0/System.Web.Extensions*dll
 %gac_dll System.ComponentModel.DataAnnotations
 %gac_dll System.IdentityModel.Selectors
 %gac_dll System.IdentityModel
@@ -600,7 +611,6 @@ install monodir %{buildroot}%{_bindir}
 %gac_dll System.Messaging
 %gac_dll System.ServiceProcess
 %gac_dll System.ServiceModel
-%gac_dll System.Configuration.Install
 %gac_dll Microsoft.Vsa
 %gac_dll Mono.Messaging.RabbitMQ
 %gac_dll Mono.Messaging
@@ -619,16 +629,8 @@ install monodir %{buildroot}%{_bindir}
 %gac_dll Mono.Web
 %gac_dll Mono.WebBrowser
 %gac_dll System.Runtime.Remoting
-%gac_dll System.Web
 %gac_dll System.Runtime.Serialization.Formatters.Soap
-%{monodir}/compat-2.0/System.Web.Extensions*dll
 %gac_dll System.ServiceModel.Web
-%gac_dll System.Web.Abstractions
-%gac_dll System.Web.DynamicData
-%gac_dll System.Web.Routing
-%gac_dll System.Web.Services
-%gac_dll System.Web.Extensions.Design
-%gac_dll System.Web.Extensions
 %mono_bin disco
 %mono_bin soapsuds
 %mono_bin_1 wsdl wsdl
@@ -718,6 +720,11 @@ install monodir %{buildroot}%{_bindir}
 %{_libdir}/pkgconfig/monodoc.pc
 
 %changelog
+* Sun Jun 14 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.4.2-2
+- Fix metadata makefile (duplicates appconf.h during make install)
+- Move System.Web to mono-core (bz 434709)
+- Move System.Configuration.Install to mono-core (bz 434709)
+
 * Tue Jun 09 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.4.2-1
 - Bump to 2.4.2 preview
 - remove ppc glocks patch