[packages/mono] - updated to 3.0.3 - added am patch (fixes build with automake 1.13)

qboosh qboosh at pld-linux.org
Sat Jan 12 19:22:02 CET 2013


commit bdba331f49f98a39631f513be4fa559231089dc7
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Jan 12 19:22:17 2013 +0100

    - updated to 3.0.3
    - added am patch (fixes build with automake 1.13)

 mono-am.patch | 39 +++++++++++++++++++++++++++++++++++++++
 mono.spec     |  9 ++++++---
 2 files changed, 45 insertions(+), 3 deletions(-)
---
diff --git a/mono.spec b/mono.spec
index 1bc4fb2..e78942b 100644
--- a/mono.spec
+++ b/mono.spec
@@ -18,13 +18,13 @@
 Summary:	Common Language Infrastructure implementation
 Summary(pl.UTF-8):	Implementacja Common Language Infrastructure
 Name:		mono
-Version:	3.0.2
+Version:	3.0.3
 Release:	1
 License:	LGPL v2 (VM), MIT X11/GPL v2 (C# compilers), MIT X11 (classes, tools), GPL v2 (tools)
 Group:		Development/Languages
 # latest downloads summary at http://download.mono-project.com/sources-stable/
 Source0:	http://download.mono-project.com/sources/mono/%{name}-%{version}.tar.bz2
-# Source0-md5:	c8a14c8c0a6013d865f81324830e0eec
+# Source0-md5:	c1e9fb125f620597a9bc1cdc1fee9288
 Patch0:		%{name}-alpha-float.patch
 Patch1:		%{name}-mint.patch
 Patch2:		%{name}-sonames.patch
@@ -35,12 +35,13 @@ Patch6:		%{name}-ARG_MAX.patch
 Patch7:		%{name}-fix-null-requirement.patch
 Patch8:		%{name}-docs-build.patch
 Patch9:		%{name}-format-security.patch
+Patch10:	%{name}-am.patch
 URL:		http://www.mono-project.com/
 %if %(test -r /dev/random; echo $?)
 BuildRequires:	ACCESSIBLE_/dev/random
 %endif
 BuildRequires:	autoconf
-BuildRequires:	automake
+BuildRequires:	automake >= 1:1.9
 BuildRequires:	bison
 BuildRequires:	gettext-devel
 BuildRequires:	libtool
@@ -232,6 +233,7 @@ oraz dotGNU.
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 # for jay
 cat >> mcs/build/config-default.make <<'EOF'
@@ -642,6 +644,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_pkgconfigdir}/mono-options.pc
 %{_pkgconfigdir}/mono.web.pc
 %{_pkgconfigdir}/monosgen-2.pc
+%{_pkgconfigdir}/reactive.pc
 %{_pkgconfigdir}/system.web.extensions.design_1.0.pc
 %{_pkgconfigdir}/system.web.extensions_1.0.pc
 %{_pkgconfigdir}/system.web.mvc.pc
diff --git a/mono-am.patch b/mono-am.patch
new file mode 100644
index 0000000..c9ac681
--- /dev/null
+++ b/mono-am.patch
@@ -0,0 +1,39 @@
+--- mono-3.0.3/configure.in.orig	2013-01-08 19:42:26.000000000 +0100
++++ mono-3.0.3/configure.in	2013-01-12 16:35:42.470362808 +0100
+@@ -14,7 +14,7 @@
+ m4_ifdef([_A][M_PROG_TAR],[_A][M_SET_OPTION([tar-ustar])])
+ 
+ AM_INIT_AUTOMAKE([1.9 dist-bzip2 tar-ustar no-dist-gzip foreign])
+-AM_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADERS([config.h])
+ AM_MAINTAINER_MODE
+ 
+ API_VER=2.0
+@@ -362,7 +362,6 @@
+ AC_CHECK_TOOL(CXX, g++, g++)
+ AC_PROG_CXX
+ AM_PROG_AS
+-AM_PROG_CC_STDC
+ AC_PROG_INSTALL
+ AC_PROG_AWK
+ dnl We should use AM_PROG_AS, but it's not available on automake/aclocal 1.4
+--- mono-3.0.3/runtime/Makefile.am.orig	2013-01-08 19:45:55.000000000 +0100
++++ mono-3.0.3/runtime/Makefile.am	2013-01-12 16:56:35.533670023 +0100
+@@ -1,6 +1,3 @@
+-# hack to prevent 'check' from depending on 'all'
+-AUTOMAKE_OPTIONS = cygnus
+-
+ tmpinst = _tmpinst
+ 
+ noinst_SCRIPTS = mono-wrapper monodis-wrapper
+--- mono-3.0.3/eglib/configure.ac.orig	2013-01-08 19:45:55.000000000 +0100
++++ mono-3.0.3/eglib/configure.ac	2013-01-12 17:16:01.663645717 +0100
+@@ -10,7 +10,7 @@
+ AC_CANONICAL_HOST
+ 
+ AM_INIT_AUTOMAKE([1.9 dist-bzip2 tar-ustar no-dist-gzip foreign])
+-AM_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADERS([config.h])
+ AM_MAINTAINER_MODE
+ 
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mono.git/commitdiff/bdba331f49f98a39631f513be4fa559231089dc7



More information about the pld-cvs-commit mailing list