[packages/lxc] fix for am 1.14

glen glen at pld-linux.org
Tue Sep 17 10:17:19 CEST 2013


commit 92ccd5f85701c46520d21fe0cf788d4b471f6c8e
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Sep 17 11:16:46 2013 +0300

    fix for am 1.14
    
    patch from archlinux
    https://bugs.archlinux.org/task/35907

 am-1.14.patch | 11 +++++++++++
 lxc.spec      |  4 +++-
 2 files changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/lxc.spec b/lxc.spec
index b183931..d880114 100644
--- a/lxc.spec
+++ b/lxc.spec
@@ -8,13 +8,14 @@ Summary:	Linux Container Tools
 Summary(pl.UTF-8):	Narzędzia do kontenerów linuksowych (LXC)
 Name:		lxc
 Version:	0.9.0
-Release:	2
+Release:	3
 License:	LGPL v2.1+
 Group:		Applications/System
 Source0:	http://lxc.sourceforge.net/download/lxc/%{name}-%{version}.tar.gz
 # Source0-md5:	8552a4479090616f4bc04d8473765fc9
 Patch0:		%{name}-devpts.patch
 Patch1:		%{name}-pld.patch
+Patch2:		am-1.14.patch
 URL:		http://lxc.sourceforge.net/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
@@ -96,6 +97,7 @@ Wiązanie Pythona (3.x) do LXC.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__aclocal} -I config
diff --git a/am-1.14.patch b/am-1.14.patch
new file mode 100644
index 0000000..caa962a
--- /dev/null
+++ b/am-1.14.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac	2013-06-23 17:30:24.307931021 -0400
++++ b/configure.ac	2013-06-23 17:30:43.414554866 -0400
+@@ -6,7 +6,7 @@
+ AC_CONFIG_SRCDIR([configure.ac])
+ AC_CONFIG_AUX_DIR([config])
+ AC_CONFIG_HEADERS([src/config.h])
+-AM_INIT_AUTOMAKE([-Wall -Werror -Wno-portability])
++AM_INIT_AUTOMAKE([-Wall -Werror -Wno-portability subdir-objects])
+ AC_CANONICAL_HOST
+ AM_PROG_CC_C_O
+ AC_GNU_SOURCE
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/lxc.git/commitdiff/92ccd5f85701c46520d21fe0cf788d4b471f6c8e



More information about the pld-cvs-commit mailing list