packages: automake/automake.spec, automake/automake-git.patch - rel 2; fix ...

[arekm]

Author: arekm                        Date: Sun Apr  1 13:52:57 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2; fix missing am__py_compile in some cases

---- Files affected:
packages/automake:
   automake.spec (1.148 -> 1.149) , automake-git.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/automake/automake.spec
diff -u packages/automake/automake.spec:1.148 packages/automake/automake.spec:1.149
--- packages/automake/automake.spec:1.148	Thu Feb  2 17:21:35 2012
+++ packages/automake/automake.spec	Sun Apr  1 15:52:52 2012
@@ -16,7 +16,7 @@
 Summary(uk.UTF-8):	GNU automake - інструменти для автоматичної генерації Makefile'ів
 Name:		automake
 Version:	1.11.3
-Release:	1
+Release:	2
 Epoch:		1
 License:	GPL v2+
 Group:		Development/Building
@@ -26,7 +26,7 @@
 Patch1:		%{name}-man.patch
 Patch2:		%{name}-no_versioned_dir.patch
 Patch3:		%{name}-morearchs.patch
-#Patch4:		%{name}-git.patch
+Patch4:		%{name}-git.patch
 URL:		http://sources.redhat.com/automake/
 %if %{with bootstrap}
 BuildRequires:	autoconf >= 2.62
@@ -109,6 +109,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %if %{without bootstrap}
 # prepare temporary copy of m4 dir without amversion.m4 (which causes automake version check)
@@ -195,6 +196,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.149  2012/04/01 13:52:52  arekm
+- rel 2; fix missing am__py_compile in some cases
+
 Revision 1.148  2012/02/02 16:21:35  qboosh
 - updated to 1.11.3
 - updated info patch

================================================================
Index: packages/automake/automake-git.patch
diff -u /dev/null packages/automake/automake-git.patch:1.3
--- /dev/null	Sun Apr  1 15:52:57 2012
+++ packages/automake/automake-git.patch	Sun Apr  1 15:52:52 2012
@@ -0,0 +1,39 @@
+commit 819005ae2c86c3ef4b77bea7176bb6d8b67ebd64
+Author: Steven Drake <sbd at NetBSD.org>
+Date:   Thu Mar 15 09:12:00 2012 +0100
+
+    python: avoid failures due to $(am__py_compile) being undefined
+    
+    Fixes automake bug#10995, introduced in commit v1.11-372-gb46debf.
+    
+    * lib/am/python.am: Move the definition of 'am__py_compile' to
+    ensure it is always emitted in the output Makefile.in.  Previously,
+    this wouldn't have happened if the input Makefile.am contained a
+    'noinst_PYTHON' declaration before a 'python_PYTHON' one.
+    * tests/Makefile.am (XFAIL_TESTS): Remove 'python-pr10995.test' and
+    'python.test'.
+    * NEWS: Update.
+    
+    Copyright-paperwork-exempt: yes
+    Signed-off-by: Stefano Lattarini <stefano.lattarini at gmail.com>
+
+diff --git a/lib/am/python.am b/lib/am/python.am
+index 427c95d..bb2748c 100644
+--- a/lib/am/python.am
++++ b/lib/am/python.am
+@@ -19,12 +18,13 @@ if %?INSTALL%
+ include inst-vars.am
+ endif %?INSTALL%
+ 
++?FIRST?am__py_compile = PYTHON=$(PYTHON) $(SHELL) $(py_compile)
++
+ ## ------------ ##
+ ## Installing.  ##
+ ## ------------ ##
+ 
+ if %?INSTALL%
+-?FIRST?am__py_compile = PYTHON=$(PYTHON) $(SHELL) $(py_compile)
+ am__installdirs += "$(DESTDIR)$(%NDIR%dir)"
+ .PHONY install-%EXEC?exec:data%-am: install-%DIR%PYTHON
+ install-%DIR%PYTHON: $(%DIR%_PYTHON)
+
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/automake/automake.spec?r1=1.148&r2=1.149
    http://cvs.pld-linux.org/packages/automake/automake-git.patch?r1=1.2&r2=1.3