- rel 2; fix missing am__py_compile in some cases

Changed files:
    automake-git.patch -> 1.3
    automake.spec -> 1.149

diff --git a/automake-git.patch b/automake-git.patch
new file mode 100644 (file)
index 0000000..ffe9d7e
--- /dev/null
+++ b/automake-git.patch
@@ -0,0 +1,39 @@
+commit 819005ae2c86c3ef4b77bea7176bb6d8b67ebd64
+Author: Steven Drake <sbd@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@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)
+

diff --git a/automake.spec b/automake.spec
index cb5e73c1bb0644ab0ed676b9bc734477b3837d5a..571c51483325ee5974b53e04e5a70b855f36b006 100644 (file)
--- a/automake.spec
+++ b/automake.spec
@@ -15,7 +15,7 @@ Summary(tr.UTF-8):    Makefile yapılandırma araçları
 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
@@ -25,7 +25,7 @@ Patch0:               %{name}-info.patch
 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
@@ -108,6 +108,7 @@ Makefile'ів.
 %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)