- allow versioned BRs when generating them for kernel packages

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

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index a2c294c26da8641cbc9f1874bf0cb9a2ab6fa223..63862e9dcedced480343812d875bbd2d51394bc0 100644 (file)
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,5 +1,5 @@
-%define                rpm_macros_rev  1.650
-%define                find_lang_rev   1.35
+%define                rpm_macros_rev  1.701
+%define                find_lang_rev   1.36
 Summary:       PLD Linux RPM build macros
 Summary(pl.UTF-8):     Makra do budowania pakietów RPM dla Linuksa PLD
 Name:          rpm-build-macros
@@ -9,9 +9,9 @@ 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
+Source5:       rpm.macros.kernel
 Patch0:                disable-systemd.patch
 #Patchx: %{name}-pydebuginfo.patch
 BuildRequires: rpm >= 4.4.9-56
@@ -50,6 +50,7 @@ Ten pakiet zawiera makra rpm-a do budowania pakietów dla Linuksa PLD.
 %setup -qcT
 cp -p %{SOURCE0} .
 cp -p %{SOURCE1} .
+cp -p %{SOURCE5} .
 
 %if "%{pld_release}" == "ac"
 %{__sed} -i -e '/libtoolize --copy --force --install/s/ --install//' rpm.macros
@@ -57,7 +58,7 @@ cp -p %{SOURCE1} .
 %endif
 
 %build
-%{__sed} -i -e 's,\$Revision\$,%{rpm_macros_rev},' 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
@@ -72,10 +73,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
+cp -a rpm.macros.kernel $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/kernel
+
 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}
 
@@ -85,7 +88,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