rpms/mono/devel mono-22-libdir.patch, NONE, 1.1 .cvsignore, 1.23, 1.24 import.log, 1.21, 1.22 mono-22-libgdiwinform.patch, 1.2, 1.3 mono.spec, 1.94, 1.95 sources, 1.29, 1.30 mono-2.2-winforms.patch, 1.2, NONE

[Paul F. Johnson]

Author: pfj

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

Modified Files:
	.cvsignore import.log mono-22-libgdiwinform.patch mono.spec 
	sources 
Added Files:
	mono-22-libdir.patch 
Removed Files:
	mono-2.2-winforms.patch 
Log Message:

Added libgdiplus patch for winforms
Moved to svn to fix a pile of problems with System.Web and Winforms
Put back in the patches instead of using sed 


mono-22-libdir.patch:

--- NEW FILE mono-22-libdir.patch ---
--- mono-1.2.6/mcs/build/config-default.make	2007-11-08 22:08:59.000000000 +0000
+++ mono-1.2.6/mcs/build/config-default-new.make	2007-12-14 22:25:20.000000000 +0000
@@ -17,7 +17,7 @@
 CFLAGS = -g -O2
 prefix = /usr/local
 exec_prefix = $(prefix)
-mono_libdir = $(exec_prefix)/lib
+mono_libdir = $(libdir)
 sysconfdir = $(prefix)/etc
 #RUNTIME = mono
 RUNTIME = false
--- mono-1.2.6/configure.in	2007-11-08 22:07:57.000000000 +0000
+++ mono-1.2.6/configure-new.in	2007-12-14 22:56:17.000000000 +0000
@@ -2182,7 +2182,7 @@
     echo "prefix=$prefix" > $srcdir/$mcsdir/build/config.make
     echo "exec_prefix=$exec_prefix" >> $srcdir/$mcsdir/build/config.make
     echo "sysconfdir=$sysconfdir" >> $srcdir/$mcsdir/build/config.make
-    echo 'mono_libdir=${exec_prefix}/lib' >> $srcdir/$mcsdir/build/config.make
+    echo 'mono_libdir=@libdir@' >> $srcdir/$mcsdir/build/config.make
     echo 'MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)' >> $srcdir/$mcsdir/build/config.make
     echo 'IL_FLAGS = /debug' >> $srcdir/$mcsdir/build/config.make
     echo "RUNTIME = $mono_build_root/runtime/mono-wrapper" >> $srcdir/$mcsdir/build/config.make
@@ -2215,7 +2215,7 @@
     if test x$cross_compiling = xno && test x$enable_olive_build != xno; then
       echo "prefix=$prefix" > $srcdir/$olivedir/build/config.make
       echo "exec_prefix=$exec_prefix" >> $srcdir/$olivedir/build/config.make
-      echo 'mono_libdir=${exec_prefix}/lib' >> $srcdir/$olivedir/build/config.make
+      echo 'mono_libdir=@libdir@' >> $srcdir/$olivedir/build/config.make
       echo 'MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)' >> $srcdir/$olivedir/build/config.make
       echo "RUNTIME = $mono_build_root/runtime/mono-wrapper" >> $srcdir/$olivedir/build/config.make
       echo "MONO_VERSION = $myver" >> $srcdir/$olivedir/build/config.make
--- mono-2.2/data/cecil.pc.in	2008-11-18 21:10:32.000000000 +0000
+++ mono-2.2/data/cecil.pc-new.in	2008-11-18 21:12:20.000000000 +0000
@@ -1,4 +1,4 @@
-assemblies_dir=@prefix@/lib/mono
+assemblies_dir=@libdir@/mono
 Libraries=${assemblies_dir}/gac/Mono.Cecil/0.6.9.0__0738eb9f132ed756/Mono.Cecil.dll
 
 Name: Mono Internal -- Do not use.
--- mono-2.2/data/mint.pc.in	2008-11-18 21:10:32.000000000 +0000
+++ mono-2.2/data/mint.pc-new.in	2008-11-18 21:12:55.000000000 +0000
@@ -1,6 +1,6 @@
 prefix=${pcfiledir}/../..
 exec_prefix=${pcfiledir}/../..
-libdir=${prefix}/lib
+libdir=@libdir@
 includedir=${prefix}/include/mono- at API_VER@
 
 
--- mono-2.2/data/mono-cairo.pc.in	2008-11-18 21:10:32.000000000 +0000
+++ mono-2.2/data/mono-cairo.pc-new.in	2008-11-18 21:13:30.000000000 +0000
@@ -1,6 +1,6 @@
 prefix=${pcfiledir}/../..
 exec_prefix=${pcfiledir}/../..
-libdir=${prefix}/@reloc_libdir@
+libdir=@libdir@
 includedir=${prefix}/include
 
 Name: Mono.Cairo

--- mono-2.2/data/mono-lineeditor.pc.in	2008-11-11 04:56:15.000000000 +0000
+++ mono-2.2/data/mono-lineeditor.pc-new.in	2008-11-18 21:14:18.000000000 +0000
@@ -1,5 +1,5 @@
 prefix=${pcfiledir}/../..
-assemblies_dir=${prefix}/lib/mono-source-libs
+assemblies_dir=@libdir@/mono-source-libs
 Sources=${assemblies_dir}/getline.cs
 
 Name: Mono.Terminal.LineEditor
--- mono-2.2/data/mono-nunit.pc.in	2008-11-11 04:56:15.000000000 +0000
+++ mono-2.2/data/mono-nunit.pc-new.in	2008-11-18 21:14:34.000000000 +0000
@@ -1,6 +1,6 @@
 prefix=${pcfiledir}/../..
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=@libdir@
 
 
 Name: Mono NUnit
--- mono-2.2/data/mono-options.pc.in	2008-11-11 04:56:15.000000000 +0000
+++ mono-2.2/data/mono-options.pc-new.in	2008-11-18 21:14:49.000000000 +0000
@@ -1,5 +1,5 @@
 prefix=${pcfiledir}/../..
-assemblies_dir=${prefix}/lib/mono-source-libs
+assemblies_dir=@libdir@/mono-source-libs
 Sources=${assemblies_dir}/Options.cs
 
 Name: Mono.Options
--- mono-2.2/data/smcs.pc.in	2008-11-18 21:10:32.000000000 +0000
+++ mono-2.2/data/smcs.pc-new.in	2008-11-18 21:17:54.000000000 +0000
@@ -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.2/data/monodoc.pc.in	2008-11-13 23:22:27.000000000 +0000
+++ mono-2.2/data/monodoc.pc-new.in	2008-11-26 12:39:50.000000000 +0000
@@ -1,9 +1,9 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-libdir=@prefix@/lib
+libdir=@libdir@
 sourcesdir=${libdir}/monodoc/sources
 
 Name: Monodoc
 Description: Monodoc - Mono Documentation Tools
 Version: @VERSION@
-Libs: /r:${prefix}/lib/mono/monodoc/monodoc.dll 
+Libs: /r:${libdir}/mono/monodoc/monodoc.dll 
--- mono-2.2/data/mono.pc.in	2008-09-10 17:12:13.000000000 +0100
+++ mono-2.2/data/mono.pc-new.in	2008-11-26 12:47:07.000000000 +0000
@@ -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.2/scripts/Makefile.am	2008-11-18 19:19:30.000000000 +0000
+++ mono-2.2/scripts/Makefile-new.am	2008-11-18 21:00:50.000000000 +0000
@@ -174,7 +174,7 @@
 endif
 else
 plat_bindir = $(bindir)
-mono_instdir = $(prefix)/lib/mono
+mono_instdir = $(libdir)/mono
 endif
 
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	25 Nov 2008 15:30:21 -0000	1.23
+++ .cvsignore	15 Dec 2008 11:57:49 -0000	1.24
@@ -1 +1 @@
-mono-2.2.tar.bz2
+mono-121507.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/import.log,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- import.log	9 Dec 2008 09:59:18 -0000	1.21
+++ import.log	15 Dec 2008 11:57:49 -0000	1.22
@@ -19,3 +19,4 @@
 mono-2_2-6_pre1_fc11:HEAD:mono-2.2-6.pre1.fc11.src.rpm:1228075040
 mono-2_2-7_pre1_fc11:HEAD:mono-2.2-7.pre1.fc11.src.rpm:1228347891
 mono-2_2-8_pre2_fc11:HEAD:mono-2.2-8.pre2.fc11.src.rpm:1228759110
+mono-2_2-10_pre2_20081215svn121507_fc11:HEAD:mono-2.2-10.pre2.20081215svn121507.fc11.src.rpm:1229342187

mono-22-libgdiwinform.patch:

Index: mono-22-libgdiwinform.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/mono-22-libgdiwinform.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mono-22-libgdiwinform.patch	9 Dec 2008 09:59:18 -0000	1.2
+++ mono-22-libgdiwinform.patch	15 Dec 2008 11:57:49 -0000	1.3
@@ -4,7 +4,7 @@
  	<dllmap dll="i:msvcrt.dll" target="@LIBC@" os="!windows"/>
  	<dllmap dll="sqlite" target="@SQLITE@" os="!windows"/>
  	<dllmap dll="sqlite3" target="@SQLITE3@" os="!windows"/>
-+	<dllmap dll="gdiplus.dll" target="libgdiplus.so.0" os="!windows"/>
++	<dllmap dll="gdiplus.dll" target="libgdiplus.so.0" os="linux"/>
  	<dllmap dll="libX11" target="@X11@" os="!windows" />
  	<dllmap dll="libcairo-2.dll" target="libcairo.so.2" os="!windows"/>
  	<dllmap dll="i:kernel32.dll">


Index: mono.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/mono.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- mono.spec	9 Dec 2008 09:59:19 -0000	1.94
+++ mono.spec	15 Dec 2008 11:57:49 -0000	1.95
@@ -1,12 +1,14 @@
+%define svnver 121507
+
 Name:		mono
 Version:        2.2
-Release:        8.pre2%{?dist}
+Release:        10.pre2.20081215svn%{svnver}%{?dist}
 Summary:        A .NET runtime environment
 
 Group:          Development/Languages
 License:        MIT
-URL:            http://go-mono.com/sources-stable/%{name}-%{version}.tar.bz2
-Source0:        %{name}-%{version}.tar.bz2
+URL:            %{name}-%{svnver}.tar.bz2
+Source0:        %{name}-%{svnver}.tar.bz2
 Source1:	monodir.c
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -32,8 +34,6 @@
 
 # JIT only availible on these:
 ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc alpha s390 s390x
-# Disabled due to strange build failure:
-# s390 s390x
 
 Patch0: mono-2.2-ppc-threading.patch
 Patch1: mono-libdir-126.patch
@@ -41,8 +41,9 @@
 Patch3: mono-2.2-uselibdir.patch
 Patch4: mono-2.0-monoservice.patch
 Patch5: mono-2.0-metadata-makefile.patch
-Patch6: mono-2.2-winforms.patch
-Patch7: mono-22-libgdiwinform.patch
+Patch6: mono-22-libgdiwinform.patch
+Patch7: mono-22-libdir.patch
+
 
 %description
 The Mono runtime implements a JIT engine for the ECMA CLI
@@ -263,7 +264,7 @@
   %{nil}
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{svnver}
 
 %patch0 -p1 -b .ppc-threading
 %patch1 -p1 -b .libdir
@@ -271,21 +272,10 @@
 %patch3 -p1 -b .uselibdir
 %patch4 -p1 -b .monoservice
 %patch5 -p1 -b .metadata-makefile
-%patch6 -p1 -b .winforms
-%patch7 -p1 -b .libgdiplus
-
-find . -name Makefile.am -or -name \*.pc.in \
-       -or -name \*.in -or -name \*.make \
-       | while read f ;
-         do
-           sed -i -e 's!$(prefix)/lib/!%{_libdir}/!' "$f" 
-           sed -i -e 's!@prefix@/lib/!%{_libdir}/!' "$f"
-           sed -i -e 's!/usr/lib/!%{_libdir}/!' "$f"
-           sed -i -e 's!${prefix}/lib/!%{_libdir}/!' "$f"
-           sed -i -e 's!${exec_prefix}/lib/!%{_libdir}/!' "$f" 
-	   sed -i -e 's!$(exec_prefix)/lib/!%{_libdir}/!' "$f"
-           sed -i -e 's!${prefix}/@reloc_libdir@/!%{_libdir}/!' "$f";
-         done
+%patch6 -p1 -b .libgdiplus
+sed -i -e 's!@libdir@!%{_libdir}!' %{PATCH7}
+%patch7 -p1 -b .libdir-22
+sed -i -e 's!%{_libdir}!@libdir@!' %{PATCH7}
 
 autoreconf -f -i -s
 
@@ -334,7 +324,6 @@
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/monostyle.1
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/oldmono.1
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/mint.1
-%{__rm} $RPM_BUILD_ROOT%{monodir}/1.0/CorCompare.exe
 %{__rm} $RPM_BUILD_ROOT%{monodir}/1.0/browsercaps-updater.exe*
 %{__rm} $RPM_BUILD_ROOT/%_bindir/smcs
 %{__rm} $RPM_BUILD_ROOT/%_libdir/pkgconfig/smcs.pc
@@ -362,7 +351,6 @@
 %{_bindir}/gacutil1
 %mono_bin mod
 %mono_bin mono-cil-strip
-%{monodir}/1.0/mono-api-diff*
 %{monodir}/?.0/mono-api-info*
 %{_bindir}/mono-test-install
 %{_bindir}/gacutil2
@@ -378,7 +366,8 @@
 %mono_bin sn
 %mono_bin installvst
 %mono_bin monolinker
-%{monodir}/1.0/transform.exe
+%{monodir}/2.0/mono-api-diff.exe
+%{monodir}/2.0/transform.exe
 %{monodir}/?.0/installutil.*
 %{monodir}/3.5/System.Web.Extensions*
 %{monodir}/2.0/System.Xml.Linq.dll
@@ -393,7 +382,6 @@
 %{_mandir}/man1/mozroots.1.gz
 %{_mandir}/man1/setreg.1.gz
 %{_mandir}/man1/sn.1.gz
-%{_mandir}/man1/vbnc.1.gz
 %{_mandir}/man1/monolinker.1.gz
 %{_mandir}/man1/resgen.1.gz
 %{_mandir}/man1/mconfig.1.gz
@@ -507,7 +495,6 @@
 %{_mandir}/man1/secutil.1.gz
 %{_mandir}/man1/sgen.1.gz
 %{_mandir}/man1/signcode.1.gz
-%{_mandir}/man1/monoburg.*
 %gac_dll PEAPI
 %gac_dll Microsoft.Build.Engine
 %gac_dll Microsoft.Build.Framework
@@ -542,13 +529,16 @@
 
 %files nunit
 %defattr(-,root,root,-)
-%doc mcs/nunit20/license.rtf mcs/nunit20/README
 %mono_bin_1 nunit-console nunit-console
 %mono_bin_2 nunit-console2 nunit-console
 %gac_dll nunit.core
 %gac_dll nunit.framework
 %gac_dll nunit.util
 %gac_dll nunit.mocks
+%gac_dll nunit-console-runner
+%gac_dll nunit.core.extensions
+%gac_dll nunit.core.interfaces
+%gac_dll nunit.framework.extensions
 
 %files nunit-devel
 %defattr(-,root,root,-)
@@ -578,6 +568,9 @@
 %gac_dll System.ServiceModel
 %gac_dll System.Configuration.Install
 %gac_dll Microsoft.Vsa
+%gac_dll Mono.Messaging.RabbitMQ
+%gac_dll Mono.Messaging
+%gac_dll RabbitMQ.Client
 
 %files winforms
 %defattr(-,root,root,-)
@@ -685,6 +678,15 @@
 %{_libdir}/pkgconfig/monodoc.pc
 
 %changelog
+* Wed Dec 10 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-10.pre2.20081215svn121507
+- removed the winform patch
+- move to svn
+- removed files no longer built
+- removed vbnc manual
+
+* Tue Dec 09 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-9.pre2
+- remove the seds and just use patches
+
 * Fri Dec 05 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-8.pre2
 - Bump to 2.2 preview 2
 - More sed fixes


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	9 Dec 2008 09:59:19 -0000	1.29
+++ sources	15 Dec 2008 11:57:49 -0000	1.30
@@ -1 +1 @@
-a311545a0003f1a599297d57e4e27916  mono-2.2.tar.bz2
+70f196588a87e43233c06c3bbac4af7a  mono-121507.tar.bz2


--- mono-2.2-winforms.patch DELETED ---