commit bdac93ae5c511c361c946514bfb82be326aa7296
Author: Jakub Bogusz <[email protected]>
Date: Sun Mar 28 21:50:44 2021 +0200
- added dir-macros-relative patch (hardcode base dir macros, derived as
relative to base)
rpm-dir-macros-relative.patch | 45 +++++++++++++++++++++++++++++++++++++++++++
rpm.spec | 2 ++
2 files changed, 47 insertions(+)
---
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
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@
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/bdac93ae5c511c361c946514bfb82be326aa7296
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
