- up to 1.11.4

Changed files:
    automake-git.patch -> 1.4
    automake.spec -> 1.150

diff --git a/automake-git.patch b/automake-git.patch
deleted file mode 100644 (file)
index ffe9d7e..0000000
--- a/automake-git.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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 571c51483325ee5974b53e04e5a70b855f36b006..51bff626a245d3ac62aad85f7370102575239266 100644 (file)
--- a/automake.spec
+++ b/automake.spec
@@ -14,18 +14,17 @@ Summary(ru.UTF-8):  GNU automake - инструменты для автомати
 Summary(tr.UTF-8):     Makefile yapılandırma araçları
 Summary(uk.UTF-8):     GNU automake - інструменти для автоматичної генерації Makefile'ів
 Name:          automake
-Version:       1.11.3
-Release:       2
+Version:       1.11.4
+Release:       1
 Epoch:         1
 License:       GPL v2+
 Group:         Development/Building
 Source0:       http://ftp.gnu.org/gnu/automake/%{name}-%{version}.tar.xz
-# Source0-md5: 3d72b2076eb4397ad5e9a2aace6357fd
+# Source0-md5: d1dd41acf56a30d8da7bf20c5ac223db
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-man.patch
 Patch2:                %{name}-no_versioned_dir.patch
 Patch3:                %{name}-morearchs.patch
-Patch4:                %{name}-git.patch
 URL:           http://sources.redhat.com/automake/
 %if %{with bootstrap}
 BuildRequires: autoconf >= 2.62
@@ -108,7 +107,6 @@ 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)