rpms/mono/devel mono-1.2.4-metadata.patch, NONE, 1.1 mono-1251-metadata.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 mono-libdir.patch, 1.4, 1.5 mono.spec, 1.54, 1.55 sources, 1.15, 1.16 mono-1.1.16.1-use-monodir.patch, 1.1, NONE mono-1.1.17.1-use-monodir.patch, 1.1, NONE mono-CVE-2006-5072-TempFileCollection.patch, 1.1, NONE
Paul F. Johnson (pfj)
fedora-extras-commits at redhat.com
Fri Oct 5 15:21:03 UTC 2007
Author: pfj
Update of /cvs/extras/rpms/mono/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20532/devel
Modified Files:
.cvsignore mono-libdir.patch mono.spec sources
Added Files:
mono-1.2.4-metadata.patch mono-1251-metadata.patch
Removed Files:
mono-1.1.16.1-use-monodir.patch
mono-1.1.17.1-use-monodir.patch
mono-CVE-2006-5072-TempFileCollection.patch
Log Message:
Update to latest version
mono-1.2.4-metadata.patch:
--- NEW FILE mono-1.2.4-metadata.patch ---
--- mono-1.2.4/mono/metadata/Makefile.am 2007-04-21 15:18:32.000000000 +0100
+++ mono-1.2.4/mono/metadata/Makefile.am-new 2007-04-21 18:03:33.000000000 +0100
@@ -21,7 +21,7 @@
#
noinst_LTLIBRARIES = libmonoruntime.la libmonoruntime-static.la
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CFLAGS) $(GLIB_CFLAGS) -DMONO_BINDIR=\"$(bindir)/\" -DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_CFG_DIR=\"$(confdir)\"
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CFLAGS) $(GLIB_CFLAGS) $(GMODULE_CFLAGS) -DMONO_BINDIR=\"$(bindir)/\" -DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_RELOC_LIBDIR=\"$(reloc_libdir)\" -DMONO_CFG_DIR=\"$(confdir)\"
#
# Make sure any prefix changes are updated in the binaries too.
mono-1251-metadata.patch:
--- NEW FILE mono-1251-metadata.patch ---
--- mono-1.2.5.1/mono/metadata/Makefile.am 2007-10-05 12:28:28.000000000 +0100
+++ mono-1.2.5.1/mono/metadata/Makefile-new.am 2007-10-05 12:29:31.000000000 +0100
@@ -9,7 +9,7 @@
# optimisation is required to actually inline them
AM_CFLAGS = -O
else
-assembliesdir = $(exec_prefix)/lib
+assembliesdir = $(libdir)
confdir = $(sysconfdir)
endif
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mono/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore 3 Jun 2007 00:17:35 -0000 1.15
+++ .cvsignore 5 Oct 2007 15:20:28 -0000 1.16
@@ -1 +1 @@
-mono-1.2.4.tar.bz2
+mono-1.2.5.1.tar.bz2
mono-libdir.patch:
Index: mono-libdir.patch
===================================================================
RCS file: /cvs/extras/rpms/mono/devel/mono-libdir.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mono-libdir.patch 3 Jun 2007 00:17:35 -0000 1.4
+++ mono-libdir.patch 5 Oct 2007 15:20:28 -0000 1.5
@@ -11,18 +11,7 @@
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
-Index: mono-1.1.16/mono/metadata/Makefile.am
-===================================================================
---- mono-1.1.16.orig/mono/metadata/Makefile.am
-+++ mono-1.1.16/mono/metadata/Makefile.am
-@@ -9,7 +9,7 @@ else
- # The mingw math.h has "extern inline" functions that dont appear in libs, so
- # optimisation is required to actually inline them
- AM_CFLAGS = -O
--assembliesdir = $(exec_prefix)/lib
-+assembliesdir = $(libdir)
- confdir = $(sysconfdir)
- endif
+
Index: mono-1.1.16/scripts/Makefile.am
===================================================================
@@ -121,17 +110,6 @@
CFLAGS += -static -fpic $(shell pkg-config --cflags glib-2.0 gobject-2.0 mono) $(EXTRAINCLUDES) -I.
---- mono-1.1.16.1/mono/metadata/Makefile.am.libdir 2006-07-05 23:55:46.000000000 +0200
-+++ mono-1.1.16.1/mono/metadata/Makefile.am 2006-08-17 17:54:36.000000000 +0200
-@@ -21,7 +21,7 @@
- #
- noinst_LTLIBRARIES = libmonoruntime.la libmonoruntime-static.la
-
--INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CFLAGS) $(GLIB_CFLAGS) -DMONO_BINDIR=\"$(bindir)/\" -DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_CFG_DIR=\"$(confdir)\"
-+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CFLAGS) $(GLIB_CFLAGS) -DMONO_BINDIR=\"$(bindir)/\" -DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_RELOC_LIBDIR=\"$(reloc_libdir)\" -DMONO_CFG_DIR=\"$(confdir)\"
-
- #
- # Make sure any prefix changes are updated in the binaries too.
--- mono-1.1.16.1/mono/metadata/assembly.c.libdir 2006-08-17 17:52:42.000000000 +0200
+++ mono-1.1.16.1/mono/metadata/assembly.c 2006-08-17 17:56:21.000000000 +0200
@@ -521,7 +521,7 @@
Index: mono.spec
===================================================================
RCS file: /cvs/extras/rpms/mono/devel/mono.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- mono.spec 14 Aug 2007 18:17:28 -0000 1.54
+++ mono.spec 5 Oct 2007 15:20:28 -0000 1.55
@@ -1,6 +1,6 @@
Name: mono
-Version: 1.2.4
-Release: 2%{?dist}
+Version: 1.2.5.1
+Release: 1%{?dist}
Summary: a .NET runtime environment
Group: Development/Languages
@@ -14,7 +14,7 @@
BuildRequires: glib2-devel
BuildRequires: pkgconfig
BuildRequires: libicu-devel
-BuildRequires: libgdiplus-devel >= 1.2.1
+BuildRequires: libgdiplus-devel >= 1.2.4
BuildRequires: zlib-devel
%ifarch ia64
BuildRequires: libunwind
@@ -31,6 +31,8 @@
Patch2: mono-1.1.13.4-ppc-threading.patch
Patch3: mono-libdir.patch
Patch4: mono-1.2.3-use-monodir.patch
+Patch5: mono-1.2.4-metadata.patch
+Patch6: mono-1251-metadata.patch
%description
The Mono runtime implements a JIT engine for the ECMA CLI
@@ -251,6 +253,7 @@
%setup -q
%patch1 -p1 -b .selinux-ia64
%patch2 -p1 -b .ppc-threading
+%patch5 -p1
%patch3 -p1 -b .libdir
%patch4 -p1 -b .use-monodir
@@ -316,6 +319,8 @@
%doc AUTHORS COPYING.LIB ChangeLog NEWS README
%{_bindir}/mono
%{_bindir}/monodir
+%{_bindir}/mono-api-*
+%{_bindir}/smcs
%mono_bin certmgr
%mono_bin chktrust
%mono_bin gacutil
@@ -324,6 +329,8 @@
%mono_bin mozroots
%mono_bin setreg
%mono_bin sn
+%mono_bin installvst
+%mono_bin monolinker
%{_bindir}/mkbundle2
%{_libdir}/libmono.so.*
%{_libdir}/libMonoPosixHelper.so
@@ -336,6 +343,9 @@
%{_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}/man5/mono-config.5.gz
%dir %{monodir}
%dir %{monodir}/1.0
@@ -350,16 +360,17 @@
%gac_dll Microsoft.VisualC
%gac_dll Mono.C5
%gac_dll Mono.Cairo
+%{_libdir}/mono/gac/Mono.Cecil
%gac_dll Mono.CompilerServices.SymbolWriter
%gac_dll Mono.GetOptions
%gac_dll Mono.Posix
%gac_dll Mono.Security
%gac_dll System
%gac_dll System.Configuration
-%gac_dll System.Core
%gac_dll System.Drawing
%gac_dll System.Security
%gac_dll System.Xml
+%gac_dll System.Core
%gac_dll cscompmgd
%gac_dll CustomMarshalers
%gac_dll OpenSystem.C
@@ -372,15 +383,12 @@
%config (noreplace) %{_sysconfdir}/mono/1.0/machine.config
%config (noreplace) %{_sysconfdir}/mono/2.0/machine.config
%{_libdir}/libikvm-native.so
+%mono_bin httpcfg
%files devel
%defattr(-,root,root,-)
%{_bindir}/monodis
%{_bindir}/pedump
-%{_bindir}/monodiet
-%{_bindir}/mono-api-diff
-%{_bindir}/mono-api-info
-%{_bindir}/mono-api-info2
%mono_bin_1 al al
%mono_bin_2 al2 al
%mono_bin caspol
@@ -389,7 +397,6 @@
%mono_bin dtd2xsd
%mono_bin dtd2rng
%mono_bin genxs
-%mono_bin installvst
%mono_bin sgen
%mono_bin_1 ilasm ilasm
%mono_bin_2 ilasm2 ilasm
@@ -407,8 +414,6 @@
%mono_bin secutil
%mono_bin signcode
%mono_bin xbuild
-%{monodir}/1.0/culevel.exe
-%{monodir}/1.0/culevel.exe.mdb
%{monodir}/1.0/ictool.exe
%{monodir}/1.0/ictool.exe.mdb
%{_mandir}/man1/al.1.gz
@@ -429,7 +434,6 @@
%{_mandir}/man1/secutil.1.gz
%{_mandir}/man1/sgen.1.gz
%{_mandir}/man1/signcode.1.gz
-%{_mandir}/man1/vbnc.1.gz
%{_mandir}/man1/monoburg.*
%gac_dll PEAPI
%gac_dll Microsoft.Build.Engine
@@ -453,6 +457,7 @@
%dir %{_datadir}/mono-1.0
%dir %{_datadir}/mono-1.0/mono
%dir %{_datadir}/mono-1.0/mono/cil
+%{_libdir}/mono/1.0/culevel*
%files nunit
%defattr(-,root,root,-)
@@ -508,7 +513,6 @@
%gac_dll System.Web.Services
%mono_bin disco
%mono_bin soapsuds
-%mono_bin_2 httpcfg httpcfg
%mono_bin_1 wsdl wsdl
%mono_bin_2 wsdl2 wsdl
%mono_bin xsd
@@ -520,6 +524,8 @@
%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?
+%mono_bin httpcfg
%{_mandir}/man1/httpcfg.1.gz
%files data
@@ -565,11 +571,12 @@
%gac_dll IBM.Data.DB2
%changelog
-* Tue Aug 14 2007 Jesse Keating <jkeating at redhat.com> 1.2.4-2
-- Rebuild for buildsystem error
+* Fri Oct 05 2007 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 1.2.5.1-1
+- bump
+- added new parts (mono-linker, resgen and mono-cecil)
-* Sat Jun 2 2007 Christopher Aillon <caillon at redhat.com> 1.2.4-1
-- Update to 1.2.4
+* Thu Apr 21 2007 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 1.2.4-1
+- update from 1.2.3
* Sun Apr 1 2007 Matthias Clasen <mclasen at redhat.com> - 1.2.3-3
- Fix a spec format error (#210633)
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mono/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources 3 Jun 2007 00:17:35 -0000 1.15
+++ sources 5 Oct 2007 15:20:28 -0000 1.16
@@ -1 +1 @@
-1d106acef8e3af3593c779f281541a0b mono-1.2.4.tar.bz2
+dfede0c8c29384a8f8a6953a9bd06224 mono-1.2.5.1.tar.bz2
--- mono-1.1.16.1-use-monodir.patch DELETED ---
--- mono-1.1.17.1-use-monodir.patch DELETED ---
--- mono-CVE-2006-5072-TempFileCollection.patch DELETED ---
More information about the fedora-extras-commits
mailing list