Tue Nov 25 15:30:52 UTC 2008

Author: pfj

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

Modified Files:
	.cvsignore import.log mono-libdir-126.patch mono.spec sources 
Added Files:
	mono-2.2-pcfiles.patch mono-2.2-ppc-threading.patch 
	mono-2.2-script.patch 
Removed Files:
	mono-2.0-BinarySerialization.patch mono-2.0-DataTable.patch 
	mono-2.0-StringReplace.patch mono-2.0-mimeicon.patch 
	mono-2.0-pcfiles.patch mono-2.0-ppc-threading.patch 
	mono-2.0-tablelayout.patch 
Log Message:

Bump to 2.2 preview 1 


mono-2.2-pcfiles.patch:

--- NEW FILE mono-2.2-pcfiles.patch ---
--- 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/monodoc.pc.in	2008-11-11 04:56:15.000000000 +0000
+++ mono-2.2/data/monodoc.pc-new.in	2008-11-18 21:13:46.000000000 +0000
@@ -1,6 +1,6 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-libdir=@prefix@/lib
+libdir=@libdir@
 sourcesdir=${libdir}/monodoc/sources
 
 Name: Monodoc
--- 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-ppc-threading.patch:

--- NEW FILE mono-2.2-ppc-threading.patch ---
--- mono-2.2/mono/mini/main.c	2008-11-18 19:00:26.000000000 +0000
+++ mono-2.2/mono/mini/main-new.c	2008-11-18 19:16:11.000000000 +0000
@@ -26,10 +26,14 @@
 }
 
 #else
-
+#include <sched.h>
 int
 main (int argc, char* argv[])
 {
+#ifdef __powerpc__
+  unsigned long mask = 1;
+  sched_setaffinity(0, sizeof(mask), &mask);
+#endif
 	mono_build_date = build_date;
 	return mono_main (argc, argv);
 }

mono-2.2-script.patch:

--- NEW FILE mono-2.2-script.patch ---
--- 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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	25 Oct 2008 08:35:58 -0000	1.22
+++ .cvsignore	25 Nov 2008 15:30:21 -0000	1.23
@@ -1 +1 @@
-mono-2.0.1.tar.bz2
+mono-2.2.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/import.log,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- import.log	16 Nov 2008 11:49:26 -0000	1.12
+++ import.log	25 Nov 2008 15:30:21 -0000	1.13
@@ -10,3 +10,4 @@
 mono-2_0_1-12_fc10:HEAD:mono-2.0.1-12.fc10.src.rpm:1224923536
 mono-2_0_1-13_fc10:HEAD:mono-2.0.1-13.fc10.src.rpm:1225659728
 mono-2_0_1-13_fc10:HEAD:mono-2.0.1-13.fc10.src.rpm:1226836107
+mono-2_2-1_pre1_fc10:HEAD:mono-2.2-1.pre1.fc10.src.rpm:1227626955

mono-libdir-126.patch:

Index: mono-libdir-126.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/mono-libdir-126.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mono-libdir-126.patch	14 Aug 2008 13:06:25 -0000	1.2
+++ mono-libdir-126.patch	25 Nov 2008 15:30:21 -0000	1.3
@@ -1,32 +1,3 @@
- 
-Index: mono-1.1.16/scripts/Makefile.am
-===================================================================
---- mono-1.1.16.orig/scripts/Makefile.am
-+++ mono-1.1.16/scripts/Makefile.am
-@@ -80,7 +80,7 @@ plat_bindir = $(shell cygpath -m $(libdi
- mono_instdir = $(shell cygpath -m $(libdir))/mono
- else
- plat_bindir = $(bindir)
--mono_instdir = $(prefix)/lib/mono
-+mono_instdir = $(libdir)/mono
- endif
- 
- REWRITE_COMMON = sed \
-Index: mono-1.1.16/scripts/mono-nunit.pc.in
-===================================================================
---- mono-1.1.16.orig/scripts/mono-nunit.pc.in
-+++ mono-1.1.16/scripts/mono-nunit.pc.in
-@@ -1,6 +1,6 @@
- prefix=${pcfiledir}/../..
- exec_prefix=${prefix}
--libdir=${exec_prefix}/lib
-+libdir=${exec_prefix}/@reloc_libdir@
- 
- 
- Name: Mono NUnit
-
-
-
 Index: mono-1.1.16/mcs/tools/cilc/res-Makefile
 ===================================================================
 --- mono-1.1.16.orig/mcs/tools/cilc/res-Makefile


Index: mono.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/mono.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- mono.spec	2 Nov 2008 21:03:08 -0000	1.85
+++ mono.spec	25 Nov 2008 15:30:21 -0000	1.86
@@ -1,6 +1,6 @@
 Name:		mono
-Version:        2.0.1
-Release:        13%{?dist}
+Version:        2.2
+Release:        1.pre1%{?dist}
 Summary:        A .NET runtime environment
 
 Group:          Development/Languages
@@ -14,7 +14,7 @@
 BuildRequires:  glib2-devel
 BuildRequires:  pkgconfig
 BuildRequires:  libicu-devel
-BuildRequires:  libgdiplus-devel >= 2.0
+BuildRequires:  libgdiplus-devel >= 2.2
 BuildRequires:  zlib-devel
 %ifarch ia64
 BuildRequires:  libunwind
@@ -22,6 +22,7 @@
 %endif
 # Required for mono-libdir.patch
 BuildRequires: automake libtool
+Obsoletes:     monodoc, monodoc-devel
 
 # Yes, mono actually depends on itself, because
 # we deleted the bootstrapping binaries. If you
@@ -34,20 +35,16 @@
 # Disabled due to strange build failure:
 # s390 s390x
 
-Patch2: mono-2.0-ppc-threading.patch
+Patch2: mono-2.2-ppc-threading.patch
 Patch3: mono-libdir-126.patch
 Patch4: mono-1.2.3-use-monodir.patch
 Patch5: mono-big-integer-CVE-2007-5197.patch
 Patch8: mono-mcs-config.patch
-Patch7: mono-2.0-pcfiles.patch
+Patch7: mono-2.2-pcfiles.patch
 Patch6:mono-2.0-uselibdir.patch
 Patch9:mono-2.0-monoservice.patch
 Patch10: mono-2.0-metadata-makefile.patch
-Patch11: mono-2.0-tablelayout.patch
-Patch12: mono-2.0-mimeicon.patch
-Patch13: mono-2.0-BinarySerialization.patch
-Patch14: mono-2.0-DataTable.patch
-Patch15: mono-2.0-StringReplace.patch
+Patch11: mono-2.2-script.patch
 
 %description
 The Mono runtime implements a JIT engine for the ECMA CLI
@@ -233,6 +230,22 @@
 no longer maintained. MySQL AB now provides MySQL Connector/Net
 which is fully managed and actively maintained.
 
+%package monodoc
+Summary:	The mono documentation system
+Group:		Documentation
+Requires:	mono-core = %{version}-%{release}
+
+%description monodoc
+monodoc is the documentation package for the mono .NET environment
+
+%package monodoc-devel
+Summary: .pc file for monodoc
+Group: Documentation
+Requires: %{name} = %{version}-%{release} pkgconfig
+
+%description monodoc-devel
+Development file for monodoc
+
 %define monodir %{_libdir}/mono
 %define gac_dll(dll)  %{monodir}/gac/%{1} \
   %{monodir}/?.0/%{1}.dll \
@@ -257,6 +270,7 @@
 sed -i -e 's!%{_libdir}!@@LIBDIR@@!' %{PATCH8}
 %patch2 -p1 -b .ppc-threading
 %patch3 -p1 -b .libdir
+%patch11 -p1 -b .libdir
 %patch4 -p1 -b .use-monodir
 %patch6 -p1 -b .use-libdir
 sed -i -e 's!@libdir@!%{_libdir}!' %{PATCH7}
@@ -264,11 +278,6 @@
 sed -i -e 's!%{_libdir}!@libdir@!' %{PATCH7}
 %patch9 -p1 -b .monoservice
 %patch10 -p1 -b .metadata
-%patch11 -p1 -b .tablelayout
-%patch12 -p1 -b .mimeicon
-%patch13 -p1 -b .serialisation
-%patch14 -p1 -b .datatable
-%patch15 -p1 -b .stringreplace
 autoreconf -f -i -s
 
 # Add undeclared Arg
@@ -318,11 +327,11 @@
 %{__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%{monodir}/1.0/mono-api-diff.exe
-#%{__rm} $RPM_BUILD_ROOT%{monodir}/*/mono-api-info.exe
 %{__rm} $RPM_BUILD_ROOT/%_bindir/smcs
 %{__rm} $RPM_BUILD_ROOT/%_libdir/pkgconfig/smcs.pc
 
+%find_lang mcs
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -334,12 +343,16 @@
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
-%files core
+%files core -f mcs.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING.LIB ChangeLog NEWS README
 %{_bindir}/mono
 %{_bindir}/monodir
 %{_bindir}/mono-api-*
+%{_bindir}/csharp
+%{_bindir}/gacutil1
+%{_bindir}/mod
+%{_bindir}/mono-cil-strip
 %{monodir}/1.0/mono-api-diff*
 %{monodir}/?.0/mono-api-info*
 %{_bindir}/mono-test-install
@@ -376,6 +389,8 @@
 %{_mandir}/man1/resgen.1.gz
 %{_mandir}/man1/mconfig.1.gz
 %{_mandir}/man5/mono-config.5.gz
+%{_mandir}/man1/csharp.1.gz
+%{_mandir}/man1/mono-cil-strip.1.gz
 %{_libdir}/libMonoPosixHelper.so
 %dir %{monodir}
 %dir %{monodir}/1.0
@@ -418,7 +433,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}/mono-source-libs/
 
 %files devel
 %defattr(-,root,root,-)
@@ -499,6 +514,9 @@
 %{_libdir}/pkgconfig/mono.pc
 %{_libdir}/pkgconfig/cecil.pc
 %{_libdir}/pkgconfig/dotnet35.pc
+%{_libdir}/pkgconfig/mono-lineeditor.pc
+%{_libdir}/pkgconfig/mono-options.pc
+%{_libdir}/pkgconfig/wcf.pc
 %{_includedir}/mono-1.0
 %{_datadir}/mono-1.0/mono/cil/cil-opcodes.xml
 %dir %{_datadir}/mono-1.0
@@ -625,7 +643,30 @@
 %defattr(-,root,root,-)
 %gac_dll IBM.Data.DB2
 
+%files monodoc
+%defattr(-, root, root)
+%{_libdir}/mono/gac/monodoc
+%{_libdir}/monodoc/*
+%{_libdir}/%{name}/
+%{_bindir}/mdoc*
+%{_bindir}/mdass*
+%{_bindir}/mdval*
+%{_bindir}/mod
+%{_bindir}/monodoc*
+%{_mandir}/man1/md*
+%{_mandir}/man1/monodoc*
+%{_mandir}/man5/mdoc*
+
+%files monodoc-devel
+%defattr (-, root, root)
+%{_libdir}/pkgconfig/monodoc.pc
+
 %changelog
+* Mon Nov 18 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-1.pre1
+- Bump to 2.2 preview 1
+- remove old patches
+- add build information for monodoc
+
 * Sun Nov 02 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0.13
 - Add in mono-api-diff and mono-api-info
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	25 Oct 2008 08:35:58 -0000	1.26
+++ sources	25 Nov 2008 15:30:21 -0000	1.27
@@ -1 +1 @@
-60ab4d1d1990826578891e90cd560fa0  mono-2.0.1.tar.bz2
+404dc9b5e0382818d19f1e88896f3884  mono-2.2.tar.bz2


--- mono-2.0-BinarySerialization.patch DELETED ---


--- mono-2.0-DataTable.patch DELETED ---


--- mono-2.0-StringReplace.patch DELETED ---


--- mono-2.0-mimeicon.patch DELETED ---


--- mono-2.0-pcfiles.patch DELETED ---


--- mono-2.0-ppc-threading.patch DELETED ---


--- mono-2.0-tablelayout.patch DELETED ---


