From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Sun, 28 Mar 2021 19:50:44 +0000 (+0200)
Subject: - added dir-macros-relative patch (hardcode base dir macros, derived as relative... 
X-Git-Tag: auto/th/rpm-4.16.1.3-6~1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=commitdiff_plain;h=bdac93ae5c511c361c946514bfb82be326aa7296;hp=afd1289ea1b9cde0efd428b0fc080248522259b4

- added dir-macros-relative patch (hardcode base dir macros, derived as relative to base)
---

diff --git a/rpm-dir-macros-relative.patch b/rpm-dir-macros-relative.patch
new file mode 100644
index 0000000..7478bb2
--- /dev/null
+++ b/rpm-dir-macros-relative.patch
@@ -0,0 +1,45 @@
+Force base dir macros to arbitrary values, derived as relative to base ones.
+Now redefining _prefix affects _{bin,sbin,lib,libexec,include,data,dataroot,info,man,doc}dir values.
+
+--- rpm-4.16.1.3/platform.in.orig	2021-03-28 18:12:24.786830780 +0200
++++ rpm-4.16.1.3/platform.in	2021-03-28 18:23:20.670665669 +0200
+@@ -25,23 +25,23 @@
+ #==============================================================================
+ # ---- configure macros.
+ #
+-%_prefix		@prefix@
+-%_exec_prefix		@exec_prefix@
+-%_bindir		@bindir@
+-%_sbindir		@sbindir@
+-%_libexecdir		@libexecdir@
+-%_datarootdir		@datarootdir@
+-%_datadir		@datadir@
+-%_sysconfdir		@sysconfdir@
+-%_sharedstatedir	@sharedstatedir@
+-%_localstatedir		@localstatedir@
++%_prefix		/usr
++%_exec_prefix		%{_prefix}
++%_bindir		%{_prefix}/bin
++%_sbindir		%{_prefix}/sbin
++%_libexecdir		%{_prefix}/libexec
++%_datarootdir		%{_prefix}/share
++%_datadir		%{_datarootdir}
++%_sysconfdir		/etc
++%_sharedstatedir	/var/lib
++%_localstatedir		/var
+ %_lib			@LIB@
+-%_libdir		@exec_prefix@/@LIB@
+-%_includedir		@includedir@
+-%_oldincludedir		@oldincludedir@
+-%_infodir		@infodir@
+-%_mandir		@mandir@
+-%_initddir		%{_sysconfdir}/rc.d/init.d
++%_libdir		%{_exec_prefix}/@LIB@
++%_includedir		%{_prefix}/include
++%_oldincludedir		%{_prefix}/include
++%_infodir		%{_datarootdir}/info
++%_mandir		%{_datarootdir}/man
++%_initddir		/etc/rc.d/init.d
+ # Deprecated misspelling, present for backwards compatibility.
+ %_initrddir		%{_initddir}
+ %_rundir		@RUNDIR@
diff --git a/rpm.spec b/rpm.spec
index 0203463..f4a4236 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -61,6 +61,7 @@ Patch1:		%{name}-popt-aliases.patch
 Patch2:		%{name}-perl-macros.patch
 Patch3:		%{name}-perl-req-perlfile.patch
 Patch4:		%{name}-scripts-closefds.patch
+Patch5:		%{name}-dir-macros-relative.patch
 Patch6:		%{name}-perl_req-INC_dirs.patch
 Patch7:		%{name}-debuginfo.patch
 Patch8:		%{name}-libtool-deps.patch
@@ -598,6 +599,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 %patch6 -p0
 %patch7 -p1
 %patch8 -p1