- revert debian python detection hacks that cause misdetection in PLD

[packages/automake.git] / automake.spec

diff --git a/automake.spec b/automake.spec
index 47076df2f757d70259e59bb4eb0a48fbab47f944..93dfdb4769446f52ba0d3bf8871d0ed636e247b0 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.15
-Release:       1
+Release:       4
 Epoch:         1
 License:       GPL v2+
 Group:         Development/Building
@@ -25,6 +25,8 @@ 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
+Patch5:                revert-debian-python-hacks.patch
 URL:           http://sources.redhat.com/automake/
 BuildRequires: autoconf >= 2.69
 %if %{without bootstrap}
@@ -107,6 +109,8 @@ Makefile'ів.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %if %{without bootstrap}
 # prepare temporary copy of m4 dir without amversion.m4 (which causes automake version check)
@@ -127,8 +131,13 @@ ln -s ../m4/[!a]*.m4 ../m4/a[!m]*.m4 .
 # 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
        --host=%{_host} \
        --build=%{_host}
+%endif
 %{__make}
 
 %install