- easier to merge with AC-branch

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

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index 931048c5e7285dac759af95f1a759949cc2db0f5..631e67fc3772b7162b72c3e8d73f621a7603091c 100644 (file)
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -30,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
@@ -39,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