v1.707: make kernel module compression configurable via kmod_compress_cmd macro

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

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index b6ba5194f5eb9ff519ed196bbf1b5651cc8a3876..add7907544a993be735ea00525e298267274dfab 100644 (file)
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,5 +1,5 @@
-%define                rpm_macros_rev  1.639
-%define                find_lang_rev   1.35
+%define                rpm_macros_rev  1.707
+%define                find_lang_rev   1.37
 Summary:       PLD Linux RPM build macros
 Summary(pl.UTF-8):     Makra do budowania pakietów RPM dla Linuksa PLD
 Name:          rpm-build-macros
@@ -9,11 +9,13 @@ License:      GPL
 Group:         Development/Building
 Source0:       rpm.macros
 Source1:       service_generator.sh
-Source2:       rpm-build.sh
-Source3:       rpm-find-lang
+Source3:       find-lang.sh
 Source4:       dokuwiki-find-lang.sh
-#Patch0:               %{name}-pydebuginfo.patch
+Source5:       rpm.macros.kernel
+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}
@@ -23,6 +25,8 @@ Conflicts:    coreutils < 6.9
 Conflicts:     gettext-devel < 0.11
 # tmpdir/_tmppath macros problems; optcppflags missing
 Conflicts:     rpm < 4.4.9-72
+# macros.d/kernel
+Conflicts:     rpm-build < 5.4.15-6
 # php-config --sysconfdir
 Conflicts:     php-devel < 4:5.2.0-3
 Conflicts:     php4-devel < 3:4.4.4-10
@@ -46,20 +50,24 @@ 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} .
+cp -p %{SOURCE5} .
 
 %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
@@ -67,10 +75,12 @@ fi
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_usrlibrpm},/etc/shrc.d}
+install -d $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d
+
 cp -a rpm.macros $RPM_BUILD_ROOT%{_usrlibrpm}/macros.build
-install -p %{SOURCE1} $RPM_BUILD_ROOT%{_usrlibrpm}/service_generator.sh
-install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/shrc.d/rpm-build.sh
+cp -a rpm.macros.kernel $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/kernel
+
+install -p service_generator.sh $RPM_BUILD_ROOT%{_usrlibrpm}
 install -p %{SOURCE3} $RPM_BUILD_ROOT%{_usrlibrpm}/find-lang.sh
 install -p %{SOURCE4} $RPM_BUILD_ROOT%{_usrlibrpm}
 
@@ -80,7 +90,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %{_usrlibrpm}/macros.build
+%{_usrlibrpm}/macros.d/kernel
 %attr(755,root,root) %{_usrlibrpm}/service_generator.sh
 %attr(755,root,root) %{_usrlibrpm}/find-lang.sh
 %attr(755,root,root) %{_usrlibrpm}/dokuwiki-find-lang.sh
-/etc/shrc.d/rpm-build.sh