commit 710382e8e5f9034761af79485df8ef019f71aae8
Author: Jan Rękorajski <[email protected]>
Date: Sat Sep 10 22:34:48 2022 +0200
- up to 4.17.1.1
rpm.spec | 16 ++--------------
x32.patch | 8 ++++----
2 files changed, 6 insertions(+), 18 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index a0e9165..9f95e2f 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -33,13 +33,13 @@ Summary(pt_BR.UTF-8): Gerenciador de pacotes RPM
Summary(ru.UTF-8): Менеджер пакетов от RPM
Summary(uk.UTF-8): Менеджер пакетів від RPM
Name: rpm
-Version: 4.17.1
+Version: 4.17.1.1
Release: 1
Epoch: 1
License: GPL v2 / LGPL v2.1
Group: Base
Source0:
http://ftp.rpm.org/releases/rpm-4.17.x/%{name}-%{version}.tar.bz2
-# Source0-md5: 9da155ee8e560fd9ada8b858a73907bb
+# Source0-md5: 30e5806bdcb06a17cabf23d8f07b6b0f
Source1: ftp://ftp.pld-linux.org/dists/th/PLD-3.0-Th-GPG-key.asc
# Source1-md5: 23914bb49fafe7153cee87126d966461
Source2: macros.local
@@ -1036,19 +1036,7 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
# needs hacked pkg-config to return anything
%attr(755,root,root) %{_rpmlibdir}/pkgconfigdeps.sh
%attr(755,root,root) %{_rpmlibdir}/mkinstalldirs
-
%attr(755,root,root) %{_rpmlibdir}/fontconfig.prov
-# must be here for "Requires: rpm-*prov" to work
-#%{_rpmlibdir}/macros.d/cmake
-#%{_rpmlibdir}/macros.d/gstreamer
-#%{_rpmlibdir}/macros.d/libtool
-#%{_rpmlibdir}/macros.d/perl
-#%{_rpmlibdir}/macros.d/pkgconfig
-#%{_rpmlibdir}/macros.d/python
-#%{_rpmlibdir}/macros.d/selinux
-#%{_rpmlibdir}/macros.d/tcl
-#%{_rpmlibdir}/macros.rpmbuild
-
%attr(755,root,root) %{_rpmlibdir}/check-buildroot
%attr(755,root,root) %{_rpmlibdir}/check-prereqs
%attr(755,root,root) %{_rpmlibdir}/check-rpaths
diff --git a/x32.patch b/x32.patch
index 32b0caa..9eab78d 100644
--- a/x32.patch
+++ b/x32.patch
@@ -52,16 +52,16 @@ diff -ur rpm-4.16.1.2/configure.ac
rpm-4.16.1.2.x32/configure.ac
--- rpm-4.16.1.2/configure.ac 2021-03-21 21:51:28.221530479 +0100
+++ rpm-4.16.1.2.x32/configure.ac 2021-03-21 21:50:04.127398387 +0100
@@ -930,6 +930,10 @@
- if echo "$host_os" | grep '.*-gnu$' > /dev/null ; then
+ if echo "$host_os" | grep '.*-gnu' > /dev/null ; then
host_os=`echo "${host_os}" | sed 's/-gnu$//'`
fi
+if echo "$host_os" | grep '.*-gnux32' > /dev/null ; then
+ host_os=`echo "${host_os}" | sed 's/-gnux32$//'`
+ host_os_gnu=-gnux32
+fi
- if echo "$host_os" | grep '.*-gnu[[^-]]*$' > /dev/null ; then
- AC_MSG_ERROR([unrecognized GNU build triplet $host_os])
- fi
+
+ changequote(<, >)
+ host_os_exact="${host_os}"
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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/710382e8e5f9034761af79485df8ef019f71aae8
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
