X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm-build-macros.spec;h=239faa46e71cb56d7772ecbb8e3475fb321b3e9b;hb=96d010e9f5a1606619436eaf0738bb95d1910b4e;hp=bfb1d2f49a590654c49d50fc7adc7bdaaebc688c;hpb=d2c9cab9154c0f8e2d953d65cbf162848f30b27d;p=packages%2Frpm-build-macros.git

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index bfb1d2f..239faa4 100644
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,25 +1,18 @@
-#
-# 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.668
-%define		find_lang_rev	1.36
+%define		rpm_macros_rev	1.734
+%define		find_lang_rev	1.40
 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
 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
@@ -32,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
@@ -57,12 +52,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,11 +75,14 @@ fi
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_usrlibrpm}
-cp -a rpm.macros $RPM_BUILD_ROOT%{_usrlibrpm}/macros.build
+install -d $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d
+
+cp -p rpm.macros $RPM_BUILD_ROOT%{_usrlibrpm}/macros.build
+cp -p 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}
+install -p %{SOURCE4} $RPM_BUILD_ROOT%{_usrlibrpm}/dokuwiki-find-lang.sh
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -92,6 +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