rpms/mono/devel .cvsignore, 1.18, 1.19 mono-1.2.3-use-monodir.patch, 1.1, 1.2 mono.spec, 1.64, 1.65 sources, 1.18, 1.19
Paul F. Johnson (pfj)
fedora-extras-commits at redhat.com
Thu Feb 21 12:05:40 UTC 2008
Author: pfj
Update of /cvs/pkgs/rpms/mono/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7022/devel
Modified Files:
.cvsignore mono-1.2.3-use-monodir.patch mono.spec sources
Log Message:
1.9 preview 2
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore 17 Dec 2007 00:59:27 -0000 1.18
+++ .cvsignore 21 Feb 2008 12:04:54 -0000 1.19
@@ -1 +1 @@
-mono-1.2.6.tar.bz2
+mono-1.9.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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mono-1.2.3-use-monodir.patch 8 Feb 2007 09:46:25 -0000 1.1
+++ mono-1.2.3-use-monodir.patch 21 Feb 2008 12:04:54 -0000 1.2
@@ -4,8 +4,16 @@
#!/bin/sh
-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.2.3/scripts/mono-service.in 2007-01-25 06:11:11.000000000 +0000
-+++ mono-1.2.3/scripts/mono-service-new.in 2007-01-27 23:44:26.000000000 +0000
+
+--- mono-1.2.3/scripts/script_umask.in 2006-08-25 20:35:14.000000000 +0100
++++ mono-1.2.3/scripts/script_umask-new.in 2007-01-27 23:45:58.000000000 +0000
+@@ -1,3 +1,3 @@
+ #!/bin/sh
+ 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
@@ -13,13 +21,6 @@
- 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 &
-+ exec @bindir@/@mono_interp@ $MONO_OPTIONS `@bindir@/monodir`/@framework_version@/@exe_name at .exe $args </dev/null >& /dev/null &
+- 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-1.2.3/scripts/script_umask.in 2006-08-25 20:35:14.000000000 +0100
-+++ mono-1.2.3/scripts/script_umask-new.in 2007-01-27 23:45:58.000000000 +0000
-@@ -1,3 +1,3 @@
- #!/bin/sh
- 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 "$@"
Index: mono.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/mono.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- mono.spec 19 Feb 2008 10:53:36 -0000 1.64
+++ mono.spec 21 Feb 2008 12:04:54 -0000 1.65
@@ -1,7 +1,7 @@
-Name: mono
-Version: 1.2.6
-Release: 7.1%{?dist}
-Summary: a .NET runtime environment
+Name: mono
+Version: 1.9
+Release: 1%{?dist}
+Summary: A .NET runtime environment
Group: Development/Languages
License: GPL, LGPL, MIT X11
@@ -243,7 +243,7 @@
sed -i -e 's!%{_libdir}!@@LIBDIR@@!' %{PATCH8}
%patch1 -p1 -b .selinux-ia64
%patch2 -p1 -b .ppc-threading
-%patch5 -p1
+%patch5 -p1 -b .monodir
%patch3 -p1 -b .libdir
%patch4 -p1 -b .use-monodir
%patch6 -p1 -b .metadata
@@ -328,6 +328,12 @@
%mono_bin installvst
%mono_bin monolinker
%{monodir}/1.0/transform.exe
+%{monodir}/?.0/installutil.*
+%{monodir}/2.1/System*
+%{monodir}/2.1/smcs*
+%{monodir}/2.1/mscorlib*
+%{monodir}/3.5/System.Web.Extensions*
+%{monodir}/3.5/System.Xml.Linq.dll
%{_bindir}/mkbundle2
%{_libdir}/libmono.so.*
%{_libdir}/libMonoPosixHelper.so
@@ -348,6 +354,8 @@
%dir %{monodir}
%dir %{monodir}/1.0
%dir %{monodir}/2.0
+%dir %{monodir}/2.1
+%dir %{monodir}/3.5
%dir %{monodir}/gac
%dir %{monodir}/compat-*
%gac_dll Commons.Xml.Relaxng
@@ -358,8 +366,8 @@
%gac_dll Microsoft.VisualC
%gac_dll Mono.C5
%gac_dll Mono.Cairo
-%{_libdir}/mono/gac/Mono.Cecil
-%{_libdir}/mono/gac/Mono.Cecil.Mdb
+%{monodir}/gac/Mono.Cecil
+%{monodir}/gac/Mono.Cecil.Mdb
%gac_dll Mono.Mozilla
%gac_dll Mono.CompilerServices.SymbolWriter
%gac_dll Mono.GetOptions
@@ -374,6 +382,8 @@
%gac_dll cscompmgd
%gac_dll CustomMarshalers
%gac_dll OpenSystem.C
+%{monodir}/gac/System.Xml.Core
+%{monodir}/gac/System.Xml.Linq
%{monodir}/?.0/mscorlib.dll
%{monodir}/?.0/mscorlib.dll.mdb
%dir %{_sysconfdir}/mono
@@ -383,6 +393,7 @@
%config (noreplace) %{_sysconfdir}/mono/1.0/machine.config
%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
@@ -575,8 +586,9 @@
%gac_dll IBM.Data.DB2
%changelog
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.2.6-7.1
-- Autorebuild for GCC 4.3
+* Mon Feb 04 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.9-1
+- bump to preview 2
+- spec file fixes
* Wed Dec 19 2007 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.2.6-6.1
- added BR libunwind-devel for ia64 (bz426180)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources 17 Dec 2007 00:59:27 -0000 1.18
+++ sources 21 Feb 2008 12:04:54 -0000 1.19
@@ -1 +1 @@
-391f85b4f962269e044ceac2b5235310 mono-1.2.6.tar.bz2
+8301f01119ab5d4ec6107948effebefb mono-1.9.tar.bz2
More information about the fedora-extras-commits
mailing list