[packages/rpm] attempt to fix color preference on x32; rel 7
atler
atler at pld-linux.org
Tue May 25 17:14:18 CEST 2021
commit e1eb5d2246a722ff7518cf798810e3fc3cc050c8
Author: Jan Palus <atler at pld-linux.org>
Date: Tue May 25 17:11:29 2021 +0200
attempt to fix color preference on x32; rel 7
set %{_prefer_color} to x32 color otherwise preferred color is fixed at 2
lib/rpmts.c
1103: ts->prefcolor = rpmExpandNumeric("%{?_prefer_color}")?:2;
rpm.spec | 2 +-
x32.patch | 18 +++++++++++++++---
2 files changed, 16 insertions(+), 4 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index c1183d5..137d066 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -34,7 +34,7 @@ Summary(ru.UTF-8): Менеджер пакетов от RPM
Summary(uk.UTF-8): Менеджер пакетів від RPM
Name: rpm
Version: 4.16.1.3
-Release: 6
+Release: 7
Epoch: 1
License: GPL v2 / LGPL v2.1
Group: Base
diff --git a/x32.patch b/x32.patch
index c057d1b..1162841 100644
--- a/x32.patch
+++ b/x32.patch
@@ -96,16 +96,17 @@ diff -ur rpm-4.16.1.2/fileattrs/pythondist.attr rpm-4.16.1.2.x32/fileattrs/pytho
diff -ur rpm-4.16.1.2/installplatform rpm-4.16.1.2.x32/installplatform
--- rpm-4.16.1.2/installplatform 2020-05-28 12:04:25.027136631 +0200
+++ rpm-4.16.1.2.x32/installplatform 2021-03-21 21:51:47.671145954 +0100
-@@ -21,6 +21,8 @@
+@@ -21,6 +21,9 @@
ARCH_INSTALL_POST='%{nil}'
LIB=lib
+ TARGETCPU="%{_target_cpu}"
+ APPEND_TARGET_ABI=
++ PREFERCOLOR=
# XXX FIXME: incomplete and quite likely wrong too in places,
# consult various arch folks for correct names etc.
-@@ -82,7 +84,15 @@
+@@ -82,7 +84,16 @@
ISANAME=x86
ISABITS=64
CANONARCH=x86_64
@@ -119,6 +120,7 @@ diff -ur rpm-4.16.1.2/installplatform rpm-4.16.1.2.x32/installplatform
+ CANONCOLOR=7
+ APPEND_TARGET_ABI=1
+ TARGETCPU="x86_64"
++ PREFERCOLOR=4
;;
ia64)
ISANAME=ia
@@ -138,9 +140,11 @@ diff -ur rpm-4.16.1.2/installplatform rpm-4.16.1.2.x32/installplatform
PPD="${DESTDIR}/${platformdir}/${ARCH}-${OS}"
[ -d $PPD ] || mkdir -p $PPD
-@@ -202,6 +216,8 @@
+@@ -202,7 +216,10 @@
+ | sed -e "s, at RPMRC_OPTFLAGS@,$RPMRC_OPTFLAGS," \
-e "s, at RPMCANONARCH@,$CANONARCH,g" \
-e "s, at RPMCANONCOLOR@,$CANONCOLOR," \
++ -e "s, at RPMPREFERCOLOR@,${PREFERCOLOR:+%_prefer_color\\t$PREFERCOLOR}," \
-e "s, at RPMRC_GNU@,$RPMRC_GNU," \
+ -e "s, at TARGET_ABI@,${APPEND_TARGET_ABI:+%{?_gnu\}}," \
+ -e "s, at TARGETCPU@,$TARGETCPU," \
@@ -159,6 +163,14 @@ diff -ur rpm-4.16.1.2/platform.in rpm-4.16.1.2.x32/platform.in
%optflags @RPMRC_OPTFLAGS@
%__isa_name @ISANAME@
+@@ -21,6 +21,7 @@
+ # 1 Elf32 permitted
+ # 2 Elf64 permitted
+ %_transaction_color @RPMCANONCOLOR@
++ at RPMPREFERCOLOR@
+
+ #==============================================================================
+ # ---- configure macros.
diff -ur rpm-4.16.1.2/rpmrc.in rpm-4.16.1.2.x32/rpmrc.in
--- rpm-4.16.1.2/rpmrc.in 2020-05-28 12:04:25.075136894 +0200
+++ rpm-4.16.1.2.x32/rpmrc.in 2021-03-21 21:50:04.127398387 +0100
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/e1eb5d2246a722ff7518cf798810e3fc3cc050c8
More information about the pld-cvs-commit
mailing list