rpms/mono/devel mono-1.2.3-use-monodir.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 mono-libdir.patch, 1.2, 1.3 mono.spec, 1.48, 1.49 sources, 1.13, 1.14
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Feb 8 09:46:27 UTC 2007
Author: alexl
Update of /cvs/dist/rpms/mono/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15455
Modified Files:
.cvsignore mono-libdir.patch mono.spec sources
Added Files:
mono-1.2.3-use-monodir.patch
Log Message:
* Thu Feb 8 2007 Alexander Larsson <alexl at redhat.com> - 1.2.3-1
- update to 1.2.3
mono-1.2.3-use-monodir.patch:
mono-service-new.in | 4 ++--
script-new.in | 2 +-
script_umask-new.in | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
--- NEW FILE mono-1.2.3-use-monodir.patch ---
--- mono-1.2.3/scripts/script.in 2006-08-25 20:35:14.000000000 +0100
+++ mono-1.2.3/scripts/script-new.in 2007-01-27 23:42:39.000000000 +0000
@@ -1,2 +1,2 @@
#!/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
@@ -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 &
+ exec @bindir@/@mono_interp@ $MONO_OPTIONS `@bindir@/monodir`/@framework_version@/@exe_name at .exe $args </dev/null >& /dev/null &
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: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mono/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore 4 Dec 2006 14:48:45 -0000 1.13
+++ .cvsignore 8 Feb 2007 09:46:25 -0000 1.14
@@ -1 +1 @@
-mono-1.2.2.tar.gz
+mono-1.2.3.tar.gz
mono-libdir.patch:
mono-1.1.16.1/mcs/class/Microsoft.Build.Utilities/Mono.XBuild.Utilities/MonoLocationHelper.cs | 2 +-
mono-1.1.16.1/mcs/tools/gacutil/driver.cs | 2 +-
mono-1.1.16.1/mono/metadata/Makefile.am | 2 +-
mono-1.1.16.1/mono/metadata/assembly.c | 8 ++++----
mono-1.1.16/configure.in | 2 +-
mono-1.1.16/mcs/build/config-default.make | 2 +-
mono-1.1.16/mcs/build/profiles/atomic.make | 6 +++---
mono-1.1.16/mcs/tools/cilc/res-Makefile | 2 +-
mono-1.1.16/mono-cairo.pc.in | 2 +-
mono-1.1.16/mono/metadata/Makefile.am | 2 +-
mono-1.1.16/scripts/Makefile.am | 2 +-
mono-1.1.16/scripts/mono-nunit.pc.in | 2 +-
mono-1.2.3/mint-new.pc.in | 2 +-
13 files changed, 18 insertions(+), 18 deletions(-)
Index: mono-libdir.patch
===================================================================
RCS file: /cvs/dist/rpms/mono/devel/mono-libdir.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mono-libdir.patch 4 Dec 2006 14:48:45 -0000 1.2
+++ mono-libdir.patch 8 Feb 2007 09:46:25 -0000 1.3
@@ -51,14 +51,15 @@
Name: Mono NUnit
Index: mono-1.1.16/mint.pc.in
===================================================================
---- mono-1.1.16.orig/mint.pc.in
-+++ mono-1.1.16/mint.pc.in
+--- mono-1.2.3/mint.pc.in 2007-01-28 14:04:26.000000000 +0000
++++ mono-1.2.3/mint-new.pc.in 2007-01-28 14:10:02.000000000 +0000
@@ -1,6 +1,6 @@
prefix=${pcfiledir}/../..
exec_prefix=${pcfiledir}/../..
-libdir=${prefix}/lib
+libdir=${prefix}/@reloc_libdir@
- includedir=${prefix}/include
+ includedir=${prefix}/include/mono- at API_VER@
+
Index: mono-1.1.16/mono-cairo.pc.in
@@ -106,6 +107,7 @@
echo ; \
echo "This probably means that you are building from a miniature" ; \
echo "distribution of MCS or don't yet have an installed MCS at all." ; \
+
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/dist/rpms/mono/devel/mono.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- mono.spec 4 Dec 2006 14:48:45 -0000 1.48
+++ mono.spec 8 Feb 2007 09:46:25 -0000 1.49
@@ -1,5 +1,5 @@
Name: mono
-Version: 1.2.2
+Version: 1.2.3
Release: 1%{?dist}
Summary: a .NET runtime environment
@@ -30,7 +30,7 @@
Patch1: mono-1.1.13.4-selinux-ia64.patch
Patch2: mono-1.1.13.4-ppc-threading.patch
Patch3: mono-libdir.patch
-Patch4: mono-1.1.17.1-use-monodir.patch
+Patch4: mono-1.2.3-use-monodir.patch
%description
The Mono runtime implements a JIT engine for the ECMA CLI
@@ -364,12 +364,12 @@
%gac_dll OpenSystem.C
%{monodir}/?.0/mscorlib.dll
%{monodir}/?.0/mscorlib.dll.mdb
-%dir /etc/mono
-%dir /etc/mono/1.0
-%dir /etc/mono/2.0
-%config (noreplace) /etc/mono/config
-%config (noreplace) /etc/mono/1.0/machine.config
-%config (noreplace) /etc/mono/2.0/machine.config
+%dir %{_sysconfdir}/mono
+%dir %{_sysconfdir}/mono/1.0
+%dir %{_sysconfdir}/mono/2.0
+%config (noreplace) %{_sysconfdir}/mono/config
+%config (noreplace) %{_sysconfdir}/mono/1.0/machine.config
+%config (noreplace) %{_sysconfdir}/mono/2.0/machine.config
%{_libdir}/libikvm-native.so
%files devel
@@ -377,7 +377,8 @@
%{_bindir}/monodis
%{_bindir}/pedump
%{_bindir}/monodiet
-%mono_bin al
+%mono_bin_1 al al
+%mono_bin_2 al2 al
%mono_bin caspol
%mono_bin cert2spc
%mono_bin cilc
@@ -427,6 +428,11 @@
%gac_dll Microsoft.Build.Framework
%gac_dll Microsoft.Build.Tasks
%gac_dll Microsoft.Build.Utilities
+%{monodir}/2.0/MSBuild
+%{monodir}/2.0/Microsoft.Build.xsd
+%{monodir}/2.0/Microsoft.*.targets
+%{monodir}/2.0/Microsoft.Common.tasks
+%{monodir}/2.0/xbuild.rsp
%{_bindir}/monograph
%{_libdir}/libmono-profiler-aot.*
%{_libdir}/libmono-profiler-cov.*
@@ -434,11 +440,11 @@
%{_libdir}/pkgconfig/dotnet.pc
%{_libdir}/pkgconfig/mono-cairo.pc
%{_libdir}/pkgconfig/mono.pc
-%{_includedir}/mono
-%{_datadir}/mono/cil/cil-opcodes.xml
-%dir %{_datadir}/mono
-%dir %{_datadir}/mono/cil
-%{monodir}/xbuild
+%{_includedir}/mono-1.0
+%{_datadir}/mono-1.0/mono/cil/cil-opcodes.xml
+%dir %{_datadir}/mono-1.0
+%dir %{_datadir}/mono-1.0/mono
+%dir %{_datadir}/mono-1.0/mono/cil
%files nunit
%defattr(-,root,root,-)
@@ -501,10 +507,13 @@
%{_mandir}/man1/soapsuds.1.gz
%{_mandir}/man1/wsdl.1.gz
%{_mandir}/man1/xsd.1.gz
-%config (noreplace) /etc/mono/browscap.ini
-%config (noreplace) /etc/mono/1.0/DefaultWsdlHelpGenerator.aspx
-%config (noreplace) /etc/mono/2.0/DefaultWsdlHelpGenerator.aspx
-%config (noreplace) /etc/mono/2.0/web.config
+%config (noreplace) %{_sysconfdir}/mono/browscap.ini
+%config (noreplace) %{_sysconfdir}/mono/1.0/DefaultWsdlHelpGenerator.aspx
+%config (noreplace) %{_sysconfdir}/mono/2.0/DefaultWsdlHelpGenerator.aspx
+%config (noreplace) %{_sysconfdir}/mono/2.0/web.config
+# Hmm, this doesn't seem to ship with the .exe file?
+%{_bindir}/httpcfg
+%{_mandir}/man1/httpcfg.1.gz
%files data
%defattr(-,root,root,-)
@@ -548,6 +557,9 @@
%gac_dll IBM.Data.DB2
%changelog
+* Thu Feb 8 2007 Alexander Larsson <alexl at redhat.com> - 1.2.3-1
+- update to 1.2.3
+
* Mon Dec 4 2006 Alexander Larsson <alexl at redhat.com> - 1.2.2-1
- update to 1.2.2
- Mark config files as noreplace
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mono/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources 4 Dec 2006 14:48:45 -0000 1.13
+++ sources 8 Feb 2007 09:46:25 -0000 1.14
@@ -1 +1 @@
-b58ae75d99fae91fa63667fc2c04a268 mono-1.2.2.tar.gz
+d7af3ebcf37967e3548a02f5d61a0ebc mono-1.2.3.tar.gz
More information about the fedora-cvs-commits
mailing list