X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm-build-macros.spec;h=b3ff4c58515ea023b3b7c97b103dd8a6e456e3dc;hb=f51bfb2f3dd442b6385f49e4687ac71fe15caa10;hp=8374d0f4e2909db121a6b5bafd6cb24e89e5edb1;hpb=e340772ed0bdc21aeaa3ba292e9deef64dbdaa06;p=packages%2Frpm-build-macros.git

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index 8374d0f..b3ff4c5 100644
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,4 +1,4 @@
-%define		rpm_macros_rev	1.465
+%define		rpm_macros_rev	1.519
 %define		find_lang_rev	1.32
 Summary:	PLD Linux RPM build macros
 Summary(pl.UTF-8):	Makra do budowania pakietów RPM dla Linuksa PLD
@@ -11,18 +11,24 @@ Source0:	rpm.macros
 Source1:	service_generator.sh
 Source2:	rpm-build.sh
 Source3:	rpm-find-lang
-Provides:	rpmbuild(find_lang) = %{find_lang_rev}
+#Patch0:		%{name}-pydebuginfo.patch
+BuildRequires:	rpm >= 4.4.9-56
 Requires:	findutils >= 1:4.2.26
+Provides:	rpmbuild(find_lang) = %{find_lang_rev}
 Provides:	rpmbuild(macros) = %{rpm_macros_rev}
 Obsoletes:	rpm-macros
+# rm: option `--interactive' doesn't allow an argument
+Conflicts:	coreutils < 6.9
 Conflicts:	gettext-devel < 0.11
-# tmpdir/_tmppath macros problems
-Conflicts:	rpm < 4.4.9-52
+# tmpdir/_tmppath macros problems; optcppflags missing
+Conflicts:	rpm < 4.4.9-72
 # php-config --sysconfdir
 Conflicts:	php-devel < 4:5.2.0-3
 Conflicts:	php4-devel < 3:4.4.4-10
+%if "%{pld_release}" != "ac"
 # libtool --install
-Conflicts:	libtool <  2:2.2
+Conflicts:	libtool < 2:2.2
+%endif
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -46,11 +52,18 @@ if [ "$rev" != "%find_lang_rev" ]; then
 	: Update find_lang_rev define to $rev, and retry
 	exit 1
 fi
+cp %{SOURCE0} .
+
+%if "%{pld_release}" == "ac"
+%{__sed} -i -e '/libtoolize --copy --force --install/s/ --install//' rpm.macros
+%endif
+
+#%patch0 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_rpmlibdir},/etc/shrc.d}
-cp %{SOURCE0} $RPM_BUILD_ROOT%{_rpmlibdir}/macros.build
+cp rpm.macros $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
 install %{SOURCE3} $RPM_BUILD_ROOT%{_rpmlibdir}/find-lang.sh