packages: util-vserver/util-vserver.spec, util-vserver/util-vserver-am.patc...

[baggins]

Author: baggins                      Date: Tue Jan 31 22:36:24 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix for automake 1.11.2

---- Files affected:
packages/util-vserver:
   util-vserver.spec (1.289 -> 1.290) , util-vserver-am.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/util-vserver/util-vserver.spec
diff -u packages/util-vserver/util-vserver.spec:1.289 packages/util-vserver/util-vserver.spec:1.290
--- packages/util-vserver/util-vserver.spec:1.289	Tue Jan 31 12:55:36 2012
+++ packages/util-vserver/util-vserver.spec	Tue Jan 31 23:36:19 2012
@@ -76,6 +76,7 @@
 Patch22:	%{name}-pivot-root-ugly-hack.patch
 Patch24:	vunify-more-exclude.patch
 Patch25:	stat.patch
+Patch26:	%{name}-am.patch
 URL:		http://savannah.nongnu.org/projects/util-vserver/
 BuildRequires:	autoconf
 BuildRequires:	automake >= 1.9
@@ -436,6 +437,7 @@
 %patch22 -p1
 %patch24 -p1
 %patch25 -p1
+%patch26 -p1
 
 install %{SOURCE9} package-management.txt
 
@@ -1001,6 +1003,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.290  2012/01/31 22:36:19  baggins
+- fix for automake 1.11.2
+
 Revision 1.289  2012/01/31 11:55:36  baggins
 - release 2
 

================================================================
Index: packages/util-vserver/util-vserver-am.patch
diff -u /dev/null packages/util-vserver/util-vserver-am.patch:1.1
--- /dev/null	Tue Jan 31 23:36:24 2012
+++ packages/util-vserver/util-vserver-am.patch	Tue Jan 31 23:36:19 2012
@@ -0,0 +1,69 @@
+--- util-vserver-0.30.216-pre3002/src/Makefile-files.orig	2012-01-31 23:25:27.728011969 +0100
++++ util-vserver-0.30.216-pre3002/src/Makefile-files	2012-01-31 23:25:42.681286983 +0100
+@@ -105,7 +105,7 @@
+ 			src/context-sync.hc \
+ 			src/attribute-util.h
+ 
+-pkglib_PROGRAMS +=	src/capchroot \
++pkgbin_PROGRAMS +=	src/capchroot \
+ 			src/chain-echo \
+ 			src/chcontext-compat \
+ 			src/check-unixfile \
+@@ -132,7 +132,7 @@
+ 
+ if ENSC_HAVE_C99_COMPILER
+ if ENSC_HAVE_CRYPTO
+-pkglib_PROGRAMS +=	src/vhashify
++pkgbin_PROGRAMS +=	src/vhashify
+ endif ENSC_HAVE_CRYPTO
+ endif ENSC_HAVE_C99_COMPILER
+ 
+--- util-vserver-0.30.216-pre3002/scripts/Makefile-files.orig	2012-01-31 23:24:11.208310397 +0100
++++ util-vserver-0.30.216-pre3002/scripts/Makefile-files	2012-01-31 23:24:36.028213599 +0100
+@@ -121,9 +121,9 @@
+ sbin_SCRIPTS +=			$(scripts_sbin_src_PRGS) $(scripts_sbin_gen_PRGS) \
+ 				$(scripts_legacy_src_PRGS)
+ scripts_sbincfg_DTA =		$(scripts_sbincfg_gen_DTA)
+-pkglib_SCRIPTS +=		$(scripts_pkglib_src_SCRPTS)
++pkgdata_SCRIPTS +=		$(scripts_pkglib_src_SCRPTS)
+ legacy_SCRIPTS +=		$(scripts_legacy_src_SCRPTS) $(scripts_legacy_gen_SCRPTS)
+-pkglib_DATA +=			$(scripts_pkglib_src_DTA) $(scripts_pkglib_gen_DTA)
++pkgdata_DATA +=			$(scripts_pkglib_src_DTA) $(scripts_pkglib_gen_DTA)
+ 
+ CLEANFILES +=			$(scripts_pkglib_gen_DTA) \
+ 				$(scripts_sbin_gen_PRGS) \
+--- util-vserver-0.30.216-pre3002/Makefile.am.orig	2011-11-25 21:27:42.000000000 +0100
++++ util-vserver-0.30.216-pre3002/Makefile.am	2012-01-31 23:23:24.445159440 +0100
+@@ -34,9 +34,11 @@
+ lib_LTLIBRARIES =
+ pkglib_LTLIBRARIES =
+ 
+-pkglib_SCRIPTS =
+-pkglib_DATA =		FEATURES.txt
+-pkglib_PROGRAMS =
++pkgdatadir = $(pkglibdir)
++pkgbindir = $(pkglibdir)
++pkgdata_SCRIPTS =
++pkgdata_DATA =		FEATURES.txt
++pkgbin_PROGRAMS =
+ legacy_SCRIPTS =
+ legacy_PROGRAMS =
+ 
+@@ -167,7 +168,7 @@
+ vserverpkgdir =		$(vserverdir)/.pkg
+ vshelperstatedir =	$(localstatedir)/run/vshelper
+ 
+-fix_SCRPTS		=  $(addprefix $(pkglibdir)/, $(notdir $(pkglib_SCRIPTS))) \
++fix_SCRPTS		=  $(addprefix $(pkglibdir)/, $(notdir $(pkgdata_SCRIPTS))) \
+ 			   $(addprefix $(legacydir)/, $(notdir $(legacy_SCRIPTS))) \
+ 			   $(addprefix $(sbindir)/,   $(notdir $(sbin_SCRIPTS))) \
+ 			   $(addprefix $(initrddir)/, $(notdir $(initrd_SCRIPTS)))
+--- util-vserver-0.30.216-pre3002/gentoo/Makefile-files~	2011-11-25 21:27:42.000000000 +0100
++++ util-vserver-0.30.216-pre3002/gentoo/Makefile-files	2012-01-31 23:32:46.972965573 +0100
+@@ -29,5 +29,5 @@
+ 
+ if HAVE_GENTOO_INIT
+ initrd_SCRIPTS +=	$(gentoo_src_SCRPTS)
+-pkglib_SCRIPTS +=	gentoo/bash-wrapper
++pkgdata_SCRIPTS +=	gentoo/bash-wrapper
+ endif
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/util-vserver/util-vserver.spec?r1=1.289&r2=1.290&f=u