- ac compatible libtool macro

Changed files:
    rpm-build-macros.spec -> 1.179

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index 23165d469a532807a21b33a2f962b1de241279c5..4a4a5777de6f6e526fbc47b765049c54898696ff 100644 (file)
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,4 +1,4 @@
-%define                rpm_macros_rev  1.467
+%define                rpm_macros_rev  1.468
 %define                find_lang_rev   1.32
 Summary:       PLD Linux RPM build macros
 Summary(pl.UTF-8):     Makra do budowania pakietów RPM dla Linuksa PLD
@@ -11,8 +11,9 @@ Source0:      rpm.macros
 Source1:       service_generator.sh
 Source2:       rpm-build.sh
 Source3:       rpm-find-lang
-Provides:      rpmbuild(find_lang) = %{find_lang_rev}
+BuildRequires: rpm >= 4.4.9-56
 Requires:      findutils >= 1:4.2.26
+Provides:      rpmbuild(find_lang) = %{find_lang_rev}
 Provides:      rpmbuild(macros) = %{rpm_macros_rev}
 Obsoletes:     rpm-macros
 Conflicts:     gettext-devel < 0.11
@@ -21,8 +22,10 @@ Conflicts:   rpm < 4.4.9-52
 # php-config --sysconfdir
 Conflicts:     php-devel < 4:5.2.0-3
 Conflicts:     php4-devel < 3:4.4.4-10
+%if "%{pld_release}" != "ac"
 # libtool --install
-Conflicts:     libtool <  2:2.2
+Conflicts:     libtool < 2:2.2
+%endif
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -46,11 +49,16 @@ if [ "$rev" != "%find_lang_rev" ]; then
        : Update find_lang_rev define to $rev, and retry
        exit 1
 fi
+cp %{SOURCE0} .
+
+%if "%{pld_release}" == "ac"
+%{__sed} -i -e '/libtoolize --copy --force --install/s/ --install//' rpm.macros
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_rpmlibdir},/etc/shrc.d}
-cp %{SOURCE0} $RPM_BUILD_ROOT%{_rpmlibdir}/macros.build
+cp rpm.macros $RPM_BUILD_ROOT%{_rpmlibdir}/macros.build
 install %{SOURCE1} $RPM_BUILD_ROOT%{_rpmlibdir}/service_generator.sh
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/shrc.d/rpm-build.sh
 install %{SOURCE3} $RPM_BUILD_ROOT%{_rpmlibdir}/find-lang.sh