X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm-build-macros.spec;h=9c44576e9c69669eb4982ef51cdcf8599a57b319;hb=3800b5dc1c7205774a48ab4f2a855c1ead194f67;hp=e48f73ce2092b823443c6cf135ce703125fcc65e;hpb=46dc1bb1abd0427bce6bb878f3f50fa629c6dcb8;p=packages%2Frpm-build-macros.git

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index e48f73c..9c44576 100644
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,4 +1,4 @@
-%define		rpm_macros_rev	1.462
+%define		rpm_macros_rev	1.536
 %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,20 +11,30 @@ Source0:	rpm.macros
 Source1:	service_generator.sh
 Source2:	rpm-build.sh
 Source3:	rpm-find-lang
-Provides:	rpmbuild(find_lang) = %{find_lang_rev}
+Source4:	dokuwiki-find-lang.sh
+#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
+%endif
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_rpmlibdir %{_prefix}/lib/rpm
+# redefine to bootstrap
+%define		_usrlibrpm %{_prefix}/lib/rpm
 
 %description
 This package contains rpm build macros for PLD Linux.
@@ -34,7 +44,15 @@ Ten pakiet zawiera makra rpm-a do budowania pakietów dla Linuksa PLD.
 
 %prep
 %setup -qcT
-rev=$(awk '/^#.*Revision:.*Date/{print $3}' %{SOURCE0})
+cp %{SOURCE0} .
+#%patch0 -p1
+
+%if "%{pld_release}" == "ac"
+%{__sed} -i -e '/libtoolize --copy --force --install/s/ --install//' rpm.macros
+%endif
+
+%build
+rev=$(awk '/^#.*Revision:.*Date/{print $3}' rpm.macros)
 if [ "$rev" != "%rpm_macros_rev" ]; then
 	: Update rpm_macros_rev define to $rev, and retry
 	exit 1
@@ -47,18 +65,20 @@ fi
 
 %install
 rm -rf $RPM_BUILD_ROOT
-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 -d $RPM_BUILD_ROOT{%{_usrlibrpm},/etc/shrc.d}
+cp rpm.macros $RPM_BUILD_ROOT%{_usrlibrpm}/macros.build
+install %{SOURCE1} $RPM_BUILD_ROOT%{_usrlibrpm}/service_generator.sh
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/shrc.d/rpm-build.sh
-install %{SOURCE3} $RPM_BUILD_ROOT%{_rpmlibdir}/find-lang.sh
+install %{SOURCE3} $RPM_BUILD_ROOT%{_usrlibrpm}/find-lang.sh
+install %{SOURCE4} $RPM_BUILD_ROOT%{_usrlibrpm}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%{_rpmlibdir}/macros.build
-%attr(755,root,root) %{_rpmlibdir}/service_generator.sh
-%attr(755,root,root) %{_rpmlibdir}/find-lang.sh
+%{_usrlibrpm}/macros.build
+%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