X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=blobdiff_plain;f=rpm.spec;h=d20a55da99bbf4009562a46c079a4f8e3b8cbc3b;hp=2afcb8610dc133b16b55c119448ddff6bd0e2638;hb=a45e3899c3722e329d466a4a02a6313abce579c5;hpb=e8836e1f523a7098305049bed3e5702087d8b3a8

diff --git a/rpm.spec b/rpm.spec
index 2afcb86..d20a55d 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -1,6 +1,5 @@
 #
 # TODO:
-# - build python stuff with libs from build tree
 # - rebuild database after upgrading from rpm5
 # - when adopting, use 4.5 ticket for checklist: https://bugs.launchpad.net/pld-linux/+bug/262985
 #
@@ -42,7 +41,7 @@ Group:		Base
 Source0:	http://ftp.rpm.org/releases/rpm-4.15.x/%{name}-%{version}.tar.bz2
 # Source0-md5:	ed72147451a5ed93b2a48e2f8f5413c3
 Source1:	%{name}.groups
-Source2:	macros.pld.in
+Source2:	macros.pld
 Source3:	%{name}-install-tree
 Source4:	%{name}-find-spec-bcond
 Source5:	%{name}-hrmib-cache
@@ -73,6 +72,7 @@ Source28:	%{name}db_reset.c
 Source29:	dbupgrade.sh
 Source30:	rubygems.rb
 Source31:	gem_helper.rb
+Source32:	rpmrc.pld
 Patch0:		%{name}-man_pl.patch
 Patch1:		%{name}-popt-aliases.patch
 Patch2:		%{name}-perl-macros.patch
@@ -92,8 +92,8 @@ Patch15:	%{name}-perl-magic.patch
 Patch16:	%{name}-ignore-missing-macro-files.patch
 Patch17:	x32.patch
 Patch18:	%{name}-fix-compress-doc.patch
-Patch19:	vendor-pld.patch
 Patch20:	rpm5-db-compat.patch
+Patch21:	python-internal-build.patch
 URL:		https://rpm.org/
 BuildRequires:	%{reqdb_pkg}-devel >= %{reqdb_pkgver}
 BuildRequires:	%{reqdb_pkg}-sql-devel >= %{reqdb_pkgver}
@@ -661,10 +661,9 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch16 -p1
 %patch17 -p1
 #%patch18 -p1
-#%patch19 -p1
 %patch20 -p1
+%patch21 -p1
 
-install %{SOURCE2} pld.in
 install %{SOURCE8} scripts/php.prov.in
 install %{SOURCE9} scripts/php.req.in
 install %{SOURCE11} scripts/perl.prov.in
@@ -802,6 +801,10 @@ rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/sparc*-linux/macros
 
 %{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/find-lang.sh
 
+install -d $RPM_BUILD_ROOT%{_rpmlibdir}/pld
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_rpmlibdir}/pld/macros
+cp -p %{SOURCE32} $RPM_BUILD_ROOT%{_rpmlibdir}/pld/rpmrc
+
 cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_rpmlibdir}/install-build-tree
 cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_rpmlibdir}/find-spec-bcond
 cp -p %{SOURCE7} $RPM_BUILD_ROOT%{_rpmlibdir}/compress-doc
@@ -949,7 +952,6 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 %{_rpmlibdir}/rpmrc
 %{_rpmlibdir}/macros
 %dir %{_rpmlibdir}/macros.d
-#%{_rpmlibdir}/macros.d/pld
 %dir %{_rpmlibdir}/platform
 %{_rpmlibdir}/platform/noarch-*
 %ifarch %{ix86} %{x8664} x32
@@ -980,6 +982,9 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 %{_rpmlibdir}/platform/sparc*
 %endif
 
+%{_rpmlibdir}/pld/macros
+%{_rpmlibdir}/pld/rpmrc
+
 %attr(755,root,root) %{_rpmlibdir}/hrmib-cache
 
 %attr(755,root,root) %{_rpmlibdir}/dbupgrade.sh