- updated to 1.16.5

- updated revert-debian-python-hacks patch

diff --git a/automake.spec b/automake.spec
index a4613b1537f57eb6825db5a626de55f8a5449b7d..2c4870b77c0bca9bad26f8067508ddad54bcf5aa 100644 (file)
--- a/automake.spec
+++ b/automake.spec
@@ -13,13 +13,13 @@ 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.16.3
-Release:       2
+Version:       1.16.5
+Release:       1
 Epoch:         1
 License:       GPL v2+
 Group:         Development/Building
 Source0:       https://ftp.gnu.org/gnu/automake/%{name}-%{version}.tar.xz
-# Source0-md5: c27f608a4e1f302ec7ce42f1251c184e
+# Source0-md5: 4017e96f89fca45ca946f1c5db6be714
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-man.patch
 Patch2:                %{name}-no_versioned_dir.patch
@@ -110,6 +110,8 @@ Makefile'ів.
 %patch4 -p1
 
 %if %{without bootstrap}
+%{__sed} -i -e '/AM_INIT_AUTOMAKE/ s/-Werror //' configure.ac
+
 # prepare temporary copy of m4 dir without amversion.m4 (which causes automake version check)
 mkdir m4-tmp
 cd m4-tmp

diff --git a/revert-debian-python-hacks.patch b/revert-debian-python-hacks.patch
index b3944520fa8de27d3c77d969b44babc4a6ed2b48..3719886e61b63bff32fc5ed24cd30907fd71cccd 100644 (file)
--- a/revert-debian-python-hacks.patch
+++ b/revert-debian-python-hacks.patch
@@ -10,11 +10,11 @@ diff --git a/m4/python.m4 b/m4/python.m4
 index 32c30e2..5c58851 100644
 --- a/m4/python.m4
 +++ b/m4/python.m4
-@@ -106,25 +106,6 @@ AC_DEFUN([AM_PATH_PYTHON],
-     [am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`])
-   AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform])
+@@ -216,26 +216,6 @@ AC_DEFUN([AM_PATH_PYTHON],
+   # Substituting python_exec_prefix_subst.
+   AC_SUBST([PYTHON_EXEC_PREFIX], [$am_python_exec_prefix_subst])
  
--  # Just factor out some code duplication.
+-  # Factor out some code duplication into this shell variable.
 -  am_python_setup_sysconfig="\
 -import sys
 -# Prefer sysconfig over distutils.sysconfig, for better compatibility
@@ -33,38 +33,39 @@ index 32c30e2..5c58851 100644
 -        can_use_sysconfig = 0
 -except ImportError:
 -    pass"
+-
+   dnl emacs-page Set up 4 directories:
  
-   dnl Set up 4 directories:
- 
-@@ -141,14 +122,7 @@ except ImportError:
-      else
-        am_py_prefix=$prefix
-      fi
--     am_cv_python_pythondir=`$PYTHON -c "
+   dnl 1. pythondir: where to install python scripts.  This is the
+@@ -251,14 +231,7 @@ except ImportError:
+    else
+      am_py_prefix=$am_cv_python_prefix
+    fi
+-   am_cv_python_pythondir=`$PYTHON -c "
 -$am_python_setup_sysconfig
 -if can_use_sysconfig:
--    sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'})
+-  sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'})
 -else:
--    from distutils import sysconfig
--    sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix')
+-  from distutils import sysconfig
+-  sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix')
 -sys.stdout.write(sitedir)"`
-+     am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null`
-      case $am_cv_python_pythondir in
-      $am_py_prefix*)
-        am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
-@@ -183,14 +157,7 @@ sys.stdout.write(sitedir)"`
-      else
-        am_py_exec_prefix=$exec_prefix
-      fi
--     am_cv_python_pyexecdir=`$PYTHON -c "
++   am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null`
+    #
+    case $am_cv_python_pythondir in
+    $am_py_prefix*)
+@@ -293,14 +266,7 @@ sys.stdout.write(sitedir)"`
+    else
+      am_py_exec_prefix=$am_cv_python_exec_prefix
+    fi
+-   am_cv_python_pyexecdir=`$PYTHON -c "
 -$am_python_setup_sysconfig
 -if can_use_sysconfig:
--    sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_prefix'})
+-  sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_exec_prefix'})
 -else:
--    from distutils import sysconfig
--    sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix')
+-  from distutils import sysconfig
+-  sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_exec_prefix')
 -sys.stdout.write(sitedir)"`
-+     am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null`
-      case $am_cv_python_pyexecdir in
-      $am_py_exec_prefix*)
-        am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
++   am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null`
+    #
+    case $am_cv_python_pyexecdir in
+    $am_py_exec_prefix*)