- fix version detection for python 3.10, rel 3

[packages/automake.git] / automake.spec

diff --git a/automake.spec b/automake.spec
index 82151350ea57bba57008b301c43247ff3d430a43..e68c1fc38e8b03404dcaf3f1d1d56d7bd82b5f0d 100644 (file)
--- a/automake.spec
+++ b/automake.spec
@@ -2,7 +2,6 @@
 # Conditional build:
 %bcond_with    bootstrap       # without full regeneration
 
-%include       /usr/lib/rpm/macros.perl
 Summary:       GNU automake - Makefile configuration tools
 Summary(de.UTF-8):     GNU automake - Makefile-Konfigurationstools
 Summary(es.UTF-8):     GNU automake - herramientas de configuración de Makefile
@@ -14,18 +13,18 @@ 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.15
+Version:       1.16.5
 Release:       3
 Epoch:         1
 License:       GPL v2+
 Group:         Development/Building
-Source0:       http://ftp.gnu.org/gnu/automake/%{name}-%{version}.tar.xz
-# Source0-md5: 9a1ddb0e053474d9d1105cfe39b0c48d
+Source0:       https://ftp.gnu.org/gnu/automake/%{name}-%{version}.tar.xz
+# Source0-md5: 4017e96f89fca45ca946f1c5db6be714
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-man.patch
 Patch2:                %{name}-no_versioned_dir.patch
-Patch3:                %{name}-morearchs.patch
-Patch4:                automake-1.15-perl-escape-curly-bracket.patch
+Patch3:                revert-debian-python-hacks.patch
+Patch4:                python-3.10.patch
 URL:           http://sources.redhat.com/automake/
 BuildRequires: autoconf >= 2.69
 %if %{without bootstrap}
@@ -111,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
@@ -126,16 +127,12 @@ ln -s ../m4/[!a]*.m4 ../m4/a[!m]*.m4 .
 %{__automake}
 %endif
 
-# NOTE: _target macro becames "noarch" if ./builder passes --target=noarch, so
-# be sure use plain /usr/bin/rpmbuild.
 %configure \
-%if %{_host_cpu} == "x32"
-       --host=%{_target_platform} \
-       --build=%{_target_platform}
-%else
+%if "%{_host_cpu}" != "x32"
        --host=%{_host} \
-       --build=%{_host}
+       --build=%{_host} \
 %endif
+       --disable-silent-rules
 %{__make}
 
 %install