X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=automake.spec;h=f0d0e78c3ab73f5f14b0c2fc34fbeaf6e17adfc0;hb=25aa85ba407d9138444b942f6da8dd3fc311ea31;hp=3413b6d7cd2802ae612c96d708316f9154f07711;hpb=55dd9a4579bfb99b24b097de2dd55022acc80643;p=packages%2Fautomake.git

diff --git a/automake.spec b/automake.spec
index 3413b6d..f0d0e78 100644
--- a/automake.spec
+++ b/automake.spec
@@ -14,21 +14,22 @@ 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.13.4
+Version:	1.16
 Release:	1
 Epoch:		1
 License:	GPL v2+
 Group:		Development/Building
 Source0:	http://ftp.gnu.org/gnu/automake/%{name}-%{version}.tar.xz
-# Source0-md5:	71b03c1bc4f587add12604587d9276d1
+# Source0-md5:	bfdf69ac36c327b3a59b83ab01057e30
 Patch0:		%{name}-info.patch
 Patch1:		%{name}-man.patch
 Patch2:		%{name}-no_versioned_dir.patch
 Patch3:		%{name}-morearchs.patch
+Patch4:		revert-debian-python-hacks.patch
 URL:		http://sources.redhat.com/automake/
 BuildRequires:	autoconf >= 2.69
 %if %{without bootstrap}
-BuildRequires:	automake >= 1:1.11
+BuildRequires:	automake >= 1:1.14
 %endif
 BuildRequires:	help2man
 BuildRequires:	rpm-perlprov
@@ -49,6 +50,7 @@ Conflicts:	texinfo < 4.9
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		ver_maj		%(echo %{version} | cut -d. -f1-2)
 %define		_enable_debug_packages	0
 
 %description
@@ -106,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)
@@ -123,11 +126,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=%{_host} \
-	--build=%{_host}
+	--build=%{_host} \
+%endif
+	--disable-silent-rules
 %{__make}
 
 %install
@@ -162,11 +166,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_infodir}/automake.info*
 %{_infodir}/automake-history.info*
 %{_mandir}/man1/aclocal.1*
-%{_mandir}/man1/aclocal-1.13.1*
+%{_mandir}/man1/aclocal-%{ver_maj}.1*
 %{_mandir}/man1/automake.1*
-%{_mandir}/man1/automake-1.13.1*
+%{_mandir}/man1/automake-%{ver_maj}.1*
 
-%{_datadir}/aclocal-*
+%{_datadir}/aclocal-%{ver_maj}
 %dir %{_datadir}/automake
 %{_datadir}/automake/am
 %{_datadir}/automake/Automake
@@ -183,7 +187,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_datadir}/automake/missing
 %attr(755,root,root) %{_datadir}/automake/mkinstalldirs
 %attr(755,root,root) %{_datadir}/automake/py-compile
-%attr(755,root,root) %{_datadir}/automake/tap-driver.pl
 %attr(755,root,root) %{_datadir}/automake/tap-driver.sh
 %attr(755,root,root) %{_datadir}/automake/test-driver
 %attr(755,root,root) %{_datadir}/automake/ylwrap