- 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 2c34b9132cd7387066ed5ee46ada4ee3bc604441..63862e9dcedced480343812d875bbd2d51394bc0 100644 (file)
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,11 +1,4 @@
-#
-# Conditional build:
-%bcond_with    rpm4    # prepare macros for PLD rpm 4.5 instead of rpm5
-#
-%if "%{pld_release}" == "ac"
-%define        with_rpm4       1
-%endif
-%define                rpm_macros_rev  1.664
+%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
@@ -18,8 +11,8 @@ Source0:      rpm.macros
 Source1:       service_generator.sh
 Source3:       find-lang.sh
 Source4:       dokuwiki-find-lang.sh
+Source5:       rpm.macros.kernel
 Patch0:                disable-systemd.patch
-Patch1:                rpm4.patch
 #Patchx: %{name}-pydebuginfo.patch
 BuildRequires: rpm >= 4.4.9-56
 BuildRequires: sed >= 4.0
@@ -57,12 +50,12 @@ 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
 %patch0 -p1
 %endif
-%{?with_rpm4:%patch1 -p1}
 
 %build
 %{__sed} -i -e 's,{Revision},%{rpm_macros_rev},' rpm.macros
@@ -80,8 +73,11 @@ fi
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_usrlibrpm}
+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 %{SOURCE3} $RPM_BUILD_ROOT%{_usrlibrpm}/find-lang.sh
 install -p %{SOURCE4} $RPM_BUILD_ROOT%{_usrlibrpm}
@@ -92,6 +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