rpms/mono/devel .cvsignore, 1.12, 1.13 mono-libdir.patch, 1.1, 1.2 mono.spec, 1.47, 1.48 sources, 1.12, 1.13

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Mon Dec 4 14:48:47 UTC 2006 

Author: alexl

Update of /cvs/dist/rpms/mono/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5081

Modified Files:
	.cvsignore mono-libdir.patch mono.spec sources 
Log Message:
* Mon Dec  4 2006 Alexander Larsson <alexl at redhat.com> - 1.2.2-1
- update to 1.2.2
- Mark config files as noreplace
- Require pkgconfig in mono-devel
- Run ldconfig in post/postun



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mono/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	1 Sep 2006 15:19:04 -0000	1.12
+++ .cvsignore	4 Dec 2006 14:48:45 -0000	1.13
@@ -1 +1 @@
-mono-1.1.17.1.tar.gz
+mono-1.2.2.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/mint.pc.in                                                                        |    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 +-
 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mono-libdir.patch	18 Aug 2006 13:49:24 -0000	1.1
+++ mono-libdir.patch	4 Dec 2006 14:48:45 -0000	1.2
@@ -106,21 +106,6 @@
  	    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/class/Mono.Globalization/Makefile
-===================================================================
---- mono-1.1.16.orig/mcs/class/Mono.Globalization/Makefile
-+++ mono-1.1.16/mcs/class/Mono.Globalization/Makefile
-@@ -8,8 +8,8 @@ thelib = $(topdir)/class/lib/Mono.Global
- all-local: $(thelib)
- 
- install-local:
--	$(MKINSTALLDIRS) $(DESTDIR)$(prefix)/lib
--	$(INSTALL_LIB) $(thelib) $(DESTDIR)$(prefix)/lib
-+	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
-+	$(INSTALL_LIB) $(thelib) $(DESTDIR)$(libdir)
- 
- clean-local:
- 	rm -rf $(thelib) MonoCultures.cs write-source.exe
 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.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- mono.spec	12 Oct 2006 14:46:37 -0000	1.47
+++ mono.spec	4 Dec 2006 14:48:45 -0000	1.48
@@ -1,6 +1,6 @@
 Name:           mono
-Version:        1.1.17.1
-Release:        3%{?dist}
+Version:        1.2.2
+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
+BuildRequires:  libgdiplus-devel >= 1.2.1
 BuildRequires:  zlib-devel
 %ifarch ia64
 BuildRequires:  libunwind
@@ -31,7 +31,6 @@
 Patch2: mono-1.1.13.4-ppc-threading.patch
 Patch3: mono-libdir.patch
 Patch4: mono-1.1.17.1-use-monodir.patch
-Patch5: mono-CVE-2006-5072-TempFileCollection.patch
 
 %description
 The Mono runtime implements a JIT engine for the ECMA CLI
@@ -62,6 +61,7 @@
 Summary:        Development tools for Mono
 Group:          Development/Languages
 Requires:       mono-core = %{version}-%{release}
+Requires:       pkgconfig
 Requires:       glib2-devel
 
 # Temporary provides due to transient package, remove when rawhide is settled
@@ -253,7 +253,6 @@
 %patch2 -p1 -b .ppc-threading
 %patch3 -p1 -b .libdir
 %patch4 -p1 -b .use-monodir
-%patch5 -p1 -b .CVE-2006-5072
 
 %build
 %ifarch ia64 s390
@@ -301,6 +300,14 @@
 %{__rm} $RPM_BUILD_ROOT%{monodir}/1.0/mono-api-diff.exe
 %{__rm} $RPM_BUILD_ROOT%{monodir}/*/mono-api-info.exe
 
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%post devel -p /sbin/ldconfig
+
+%postun devel -p /sbin/ldconfig
+
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
@@ -317,6 +324,7 @@
 %mono_bin mozroots
 %mono_bin setreg
 %mono_bin sn
+%{_bindir}/mkbundle2
 %{_libdir}/libmono.so.*
 %{_libdir}/libMonoPosixHelper.so
 %{_libdir}/libMonoSupportW.so
@@ -353,14 +361,15 @@
 %gac_dll System.Xml
 %gac_dll cscompmgd
 %gac_dll CustomMarshalers
+%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 /etc/mono/config
-%config /etc/mono/1.0/machine.config
-%config /etc/mono/2.0/machine.config
+%config (noreplace) /etc/mono/config
+%config (noreplace) /etc/mono/1.0/machine.config
+%config (noreplace) /etc/mono/2.0/machine.config
 %{_libdir}/libikvm-native.so
 
 %files devel
@@ -375,6 +384,7 @@
 %mono_bin dtd2xsd
 %mono_bin dtd2rng
 %mono_bin genxs
+%mono_bin sgen
 %mono_bin_1 ilasm ilasm
 %mono_bin_2 ilasm2 ilasm
 %mono_bin macpack
@@ -409,6 +419,7 @@
 %{_mandir}/man1/permview.1.gz
 %{_mandir}/man1/prj2make.1.gz
 %{_mandir}/man1/secutil.1.gz
+%{_mandir}/man1/sgen.1.gz
 %{_mandir}/man1/signcode.1.gz
 %{_mandir}/man1/monoburg.*
 %gac_dll PEAPI
@@ -490,10 +501,10 @@
 %{_mandir}/man1/soapsuds.1.gz
 %{_mandir}/man1/wsdl.1.gz
 %{_mandir}/man1/xsd.1.gz
-%config /etc/mono/browscap.ini
-%config /etc/mono/1.0/DefaultWsdlHelpGenerator.aspx
-%config /etc/mono/2.0/DefaultWsdlHelpGenerator.aspx
-%config /etc/mono/2.0/web.config
+%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
 
 %files data
 %defattr(-,root,root,-)
@@ -537,6 +548,12 @@
 %gac_dll IBM.Data.DB2
 
 %changelog
+* Mon Dec  4 2006 Alexander Larsson <alexl at redhat.com> - 1.2.2-1
+- update to 1.2.2
+- Mark config files as noreplace
+- Require pkgconfig in mono-devel
+- Run ldconfig in post/postun
+
 * Thu Oct 12 2006 Alexander Larsson <alexl at redhat.com> - 1.1.17.1-3
 - Don't use slow TLS approach under xen (#210001) 
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mono/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	1 Sep 2006 15:19:04 -0000	1.12
+++ sources	4 Dec 2006 14:48:45 -0000	1.13
@@ -1 +1 @@
-072cb3de1f19cbebd6034f7a5cff1292  mono-1.1.17.1.tar.gz
+b58ae75d99fae91fa63667fc2c04a268  mono-1.2.2.tar.gz

More information about the fedora-cvs-commits mailing list