packages: mono/mono.spec - updated -pc.patch; removed -metadata-makefile.pa...

[megabajt]

Author: megabajt                     Date: Wed Mar 10 19:18:24 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated -pc.patch; removed -metadata-makefile.patch (seems to be obsolete / broken)
- re-added -j1 to make in %build (build fails when more jobs is used)
- packaged more files
- release 0.6

---- Files affected:
packages/mono:
   mono.spec (1.247 -> 1.248) 

---- Diffs:

================================================================
Index: packages/mono/mono.spec
diff -u packages/mono/mono.spec:1.247 packages/mono/mono.spec:1.248
--- packages/mono/mono.spec:1.247	Wed Feb 24 18:26:37 2010
+++ packages/mono/mono.spec	Wed Mar 10 20:18:18 2010
@@ -2,14 +2,6 @@
 #
 # NOTE: Makefiles are broken, build could stop long time after first fatal error
 # TODO:
-#   /usr/lib/mono-source-libs/Options.cs
-#   /usr/lib/mono-source-libs/getline.cs
-#   /usr/lib64/pkgconfig/mono-lineeditor.pc
-#   /usr/lib64/pkgconfig/mono-options.pc
-#   /usr/lib64/pkgconfig/mono.web.pc
-#   /usr/lib64/pkgconfig/system.web.extensions.design_1.0.pc
-#   /usr/lib64/pkgconfig/system.web.extensions_1.0.pc
-#   /usr/lib64/pkgconfig/wcf.pc
 # - x86_64 searches .dll from %{_libdir}, not %{_prefix}/lib:
 #   The assembly mscorlib.dll was not found or could not be loaded.
 #   It should have been installed in the `/usr/lib64/mono/2.0/mscorlib.dll' directory.
@@ -31,7 +23,7 @@
 Summary(pl.UTF-8):	Implementacja Common Language Infrastructure
 Name:		mono
 Version:	2.6.1
-Release:	0.5
+Release:	0.6
 License:	LGPL (VM), GPL (C# compilers), MIT X11 with GPL additions (classes, tools)
 Group:		Development/Languages
 # latest downloads summary at http://ftp.novell.com/pub/mono/sources-stable/
@@ -44,7 +36,6 @@
 Patch4:		%{name}-console-no-utf8-bom.patch
 Patch5:		%{name}-pc.patch
 Patch6:		%{name}-ARG_MAX.patch
-Patch7:		%{name}-metadata-makefile.patch
 URL:		http://www.mono-project.com/
 %if %(test -r /dev/random; echo $?)
 BuildRequires:	ACCESSIBLE_/dev/random
@@ -59,9 +50,10 @@
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.213
 BuildRequires:	rpmbuild(monoautodeps)
+BuildRequires:	zlib-devel
 Suggests:	binfmt-detector
 # for System.Drawing
-Suggests:	libgdiplus >= 2.0
+Suggests:	libgdiplus >= 2.6
 ExclusiveArch:	%{ix86} %{x8664} alpha arm hppa ia64 mips ppc s390 s390x sparc sparcv9
 # plain i386 is not supported; mono uses cmpxchg/xadd which require i486
 ExcludeArch:	i386
@@ -241,9 +233,8 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-#%patch5 -p1
+%patch5 -p1
 %patch6 -p1
-%patch7 -p1
 
 # for jay
 cat >>mcs/build/config-default.make <<EOF
@@ -285,7 +276,7 @@
 # in fact the flag should be "-Wl,-z,execheap" for libmint, but:
 # -z execheap doesn't seem to do anything currently
 # -z execstack for library makes only stack executable, but not heap
-%{__make} \
+%{__make} -j1 \
 	mint_LDFLAGS="-Wl,-z,execheap -Wl,-z,execstack"
 
 %install
@@ -416,6 +407,7 @@
 %{_prefix}/lib/mono/compat-2.0/*.dll
 %{_prefix}/lib/mono/gac
 %exclude %{_prefix}/lib/mono/gac/*/*/*.mdb
+%{_prefix}/lib/mono-source-libs
 %{_mandir}/man1/cert2spc.1*
 %{_mandir}/man1/certmgr.1*
 %{_mandir}/man1/chktrust.1*
@@ -568,6 +560,7 @@
 %{_prefix}/lib/mono/2.0/Microsoft.Common.targets
 %{_prefix}/lib/mono/2.0/Microsoft.VisualBasic.targets
 %{_prefix}/lib/mono/2.0/Microsoft.Common.tasks
+%{_prefix}/lib/mono/xbuild
 %attr(755,root,root) %{_rpmlibdir}/mono-find-provides
 %attr(755,root,root) %{_rpmlibdir}/mono-find-requires
 %{_datadir}/%{name}-1.0
@@ -685,6 +678,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.248  2010/03/10 19:18:18  megabajt
+- updated -pc.patch; removed -metadata-makefile.patch (seems to be obsolete / broken)
+- re-added -j1 to make in %build (build fails when more jobs is used)
+- packaged more files
+- release 0.6
+
 Revision 1.247  2010/02/24 17:26:37  vip
 - package more files
 - remove -j1, works for me (add it back if fails for you/builder)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mono/mono.spec?r1=1.247&r2=1.248&f=u