adjust to build with git

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

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index d1f469e4a0ff48826bc42974c328a96435209600..9f150b04e487124e82e71e8a43177c8b3cf16bd7 100644 (file)
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,10 +1,10 @@
-%define                rpm_macros_rev  1.620
+%define                rpm_macros_rev  1.649
 %define                find_lang_rev   1.35
 Summary:       PLD Linux RPM build macros
 Summary(pl.UTF-8):     Makra do budowania pakietów RPM dla Linuksa PLD
 Name:          rpm-build-macros
 Version:       %{rpm_macros_rev}
-Release:       1
+Release:       2
 License:       GPL
 Group:         Development/Building
 Source0:       rpm.macros
@@ -12,8 +12,10 @@ Source1:     service_generator.sh
 Source2:       rpm-build.sh
 Source3:       rpm-find-lang
 Source4:       dokuwiki-find-lang.sh
-#Patch0:               %{name}-pydebuginfo.patch
+Patch0:                disable-systemd.patch
+#Patchx: %{name}-pydebuginfo.patch
 BuildRequires: rpm >= 4.4.9-56
+BuildRequires: sed >= 4.0
 Requires:      findutils >= 1:4.2.26
 Provides:      rpmbuild(find_lang) = %{find_lang_rev}
 Provides:      rpmbuild(macros) = %{rpm_macros_rev}
@@ -46,20 +48,23 @@ Ten pakiet zawiera makra rpm-a do budowania pakietów dla Linuksa PLD.
 
 %prep
 %setup -qcT
-cp %{SOURCE0} .
-#%patch0 -p1
+cp -p %{SOURCE0} .
+cp -p %{SOURCE1} .
 
 %if "%{pld_release}" == "ac"
 %{__sed} -i -e '/libtoolize --copy --force --install/s/ --install//' rpm.macros
+%patch0 -p1
 %endif
 
 %build
-rev=$(awk '/^#.*Revision:.*Date/{print $3}' rpm.macros)
+%{__sed} -i -e 's,\$Revision\$,%{rpm_macros_rev},' rpm.macros
+
+rev=$(awk '/^%%rpm_build_macros/{print $2}' rpm.macros)
 if [ "$rev" != "%rpm_macros_rev" ]; then
        : Update rpm_macros_rev define to $rev, and retry
        exit 1
 fi
-rev=$(awk '/^#.*Id:.*/{print $4}' %{SOURCE3})
+rev=$(awk -F= '/^VERSION/{print $2}' %{SOURCE3})
 if [ "$rev" != "%find_lang_rev" ]; then
        : Update find_lang_rev define to $rev, and retry
        exit 1
@@ -69,7 +74,7 @@ fi
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_usrlibrpm},/etc/shrc.d}
 cp -a rpm.macros $RPM_BUILD_ROOT%{_usrlibrpm}/macros.build
-install -p %{SOURCE1} $RPM_BUILD_ROOT%{_usrlibrpm}/service_generator.sh
+install -p service_generator.sh $RPM_BUILD_ROOT%{_usrlibrpm}
 install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/shrc.d/rpm-build.sh
 install -p %{SOURCE3} $RPM_BUILD_ROOT%{_usrlibrpm}/find-lang.sh
 install -p %{SOURCE4} $RPM_BUILD_ROOT%{_usrlibrpm}