X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm-build-macros.spec;h=a49d5c02e99818f97ffeb1f8a0008d96ba26a8ca;hb=6adde6858efc8a73420b49356f0f0e48eda61f2a;hp=c4671d98a53118c34a907e0443e5f6ef51c616db;hpb=725c413045f93ea83667d1b1246111ae8c8e47cf;p=packages%2Frpm-build-macros.git

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index c4671d9..a49d5c0 100644
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,4 +1,4 @@
-%define	rpm_macros_rev	1.270
+%define		rpm_macros_rev 1.370
 Summary:	PLD Linux RPM build macros
 Summary(pl):	Makra do budowania pakietów RPM dla Linuksa PLD
 Name:		rpm-build-macros
@@ -8,13 +8,19 @@ License:	GPL
 Group:		Base
 Source0:	rpm.macros
 Source1:	service_generator.sh
-Requires:	rpm-build
+Source2:	rpm-build.sh
+Requires:	findutils >= 1:4.2.26
 Provides:	rpmbuild(macros) = %{rpm_macros_rev}
 Obsoletes:	rpm-macros
 BuildArch:	noarch
+# for _x_libraries macro
+Conflicts:	rpm < 4.4.2-27.1
+# php-config --sysconfdir
+Conflicts:	php-devel < 4:5.2.0-3
+Conflicts:	php4-devel < 3:4.4.4-10
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_rpmlibdir /usr/lib/rpm
+%define		_rpmlibdir %{_prefix}/lib/rpm
 
 %description
 This package contains rpm build macros for PLD Linux.
@@ -23,16 +29,18 @@ This package contains rpm build macros for PLD Linux.
 Ten pakiet zawiera makra rpm-a do budowania pakietów dla Linuksa PLD.
 
 %prep
-if ! awk '/^#.*Revision:.*Date/{exit($3 > %{rpm_macros_rev})}' %{SOURCE0}; then
-	echo >&2 "Update rpm_macros_rev, it seems outdated"
+rev=$(awk '/^#.*Revision:.*Date/{print $3}' %{SOURCE0})
+if [ "$rev" != "%rpm_macros_rev" ]; then
+	: Update rpm_macros_rev define to $rev, and retry
 	exit 1
 fi
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_rpmlibdir}
+install -d $RPM_BUILD_ROOT{%{_rpmlibdir},/etc/shrc.d}
 cp %{SOURCE0} $RPM_BUILD_ROOT%{_rpmlibdir}/macros.build
 install %{SOURCE1} $RPM_BUILD_ROOT%{_rpmlibdir}/service_generator.sh
+install %{SOURCE2} $RPM_BUILD_ROOT/etc/shrc.d/rpm-build.sh
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -41,3 +49,4 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_rpmlibdir}/macros.build
 %attr(755,root,root) %{_rpmlibdir}/service_generator.sh
+%attr(755,root,root) /etc/shrc.d/rpm-build.sh