- rev 1.465; libtoolize macro uses --install option, now

[packages/rpm-build-macros.git] / rpm-build-macros.spec

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index 43fec7297c0484ff0b679887d76580c5cfecf893..8374d0f4e2909db121a6b5bafd6cb24e89e5edb1 100644 (file)
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,4 +1,5 @@
-%define                rpm_macros_rev 1.423
+%define                rpm_macros_rev  1.465
+%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
 Name:          rpm-build-macros
@@ -9,15 +10,19 @@ Group:               Development/Building
 Source0:       rpm.macros
 Source1:       service_generator.sh
 Source2:       rpm-build.sh
+Source3:       rpm-find-lang
+Provides:      rpmbuild(find_lang) = %{find_lang_rev}
 Requires:      findutils >= 1:4.2.26
 Provides:      rpmbuild(macros) = %{rpm_macros_rev}
 Obsoletes:     rpm-macros
 Conflicts:     gettext-devel < 0.11
-# for _x_libraries macro
-Conflicts:     rpm < 4.4.2-27.1
+# tmpdir/_tmppath macros problems
+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
+# libtool --install
+Conflicts:     libtool <  2:2.2
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -31,19 +36,24 @@ Ten pakiet zawiera makra rpm-a do budowania pakietów dla Linuksa PLD.
 
 %prep
 %setup -qcT
-cp %{SOURCE0} rpm.macros
-rev=$(awk '/^#.*Revision:.*Date/{print $3}' rpm.macros)
+rev=$(awk '/^#.*Revision:.*Date/{print $3}' %{SOURCE0})
 if [ "$rev" != "%rpm_macros_rev" ]; then
        : Update rpm_macros_rev define to $rev, and retry
        exit 1
 fi
+rev=$(awk '/^#.*Id:.*/{print $4}' %{SOURCE3})
+if [ "$rev" != "%find_lang_rev" ]; then
+       : Update find_lang_rev define to $rev, and retry
+       exit 1
+fi
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_rpmlibdir},/etc/shrc.d}
-cp rpm.macros $RPM_BUILD_ROOT%{_rpmlibdir}/macros.build
+cp %{SOURCE0} $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
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -52,4 +62,5 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_rpmlibdir}/macros.build
 %attr(755,root,root) %{_rpmlibdir}/service_generator.sh
+%attr(755,root,root) %{_rpmlibdir}/find-lang.sh
 /etc/shrc.d/rpm-build.sh