- catch errors

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

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index a03fa8843a279b5cc58bccd66369af4674aeee2e..23f0e14f52d66110320fd96fb91907393a0be3a6 100644 (file)
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,4 +1,4 @@
-%define                rpm_macros_rev 1.375
+%define                rpm_macros_rev 1.391
 Summary:       PLD Linux RPM build macros
 Summary(pl.UTF-8):     Makra do budowania pakietów RPM dla Linuksa PLD
 Name:          rpm-build-macros
@@ -12,12 +12,13 @@ Source2:    rpm-build.sh
 Requires:      findutils >= 1:4.2.26
 Provides:      rpmbuild(macros) = %{rpm_macros_rev}
 Obsoletes:     rpm-macros
-BuildArch:     noarch
+Conflicts:     gettext-devel < 0.11
 # for _x_libraries macro
 Conflicts:     rpm < 4.4.2-27.1
 # php-config --sysconfdir
 Conflicts:     php-devel < 4:5.2.0-3
 Conflicts:     php4-devel < 3:4.4.4-10
+BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _rpmlibdir %{_prefix}/lib/rpm
@@ -29,7 +30,9 @@ This package contains rpm build macros for PLD Linux.
 Ten pakiet zawiera makra rpm-a do budowania pakietów dla Linuksa PLD.
 
 %prep
-rev=$(awk '/^#.*Revision:.*Date/{print $3}' %{SOURCE0})
+%setup -qcT
+cp %{SOURCE0} rpm.macros
+rev=$(awk '/^#.*Revision:.*Date/{print $3}' rpm.macros)
 if [ "$rev" != "%rpm_macros_rev" ]; then
        : Update rpm_macros_rev define to $rev, and retry
        exit 1
@@ -38,7 +41,7 @@ fi
 %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