- up to 4.17.1

diff --git a/rpm.spec b/rpm.spec
index 060b5c5618ae979c555080c52610c821963255d5..f66b98cdbee4e24aa9a35ab2c6eb2d7152da3d40 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -14,7 +14,7 @@
 %bcond_without fsverity        # fsverity plugin
 
 %define                popt_ver        1.15
-%define                sover           9.2.0
+%define                sover           9.3.0
 
 %if "%{_rpmversion}" >= "4.12" && "%{_rpmversion}" < "5"
 %define        with_recommends_tags    1
@@ -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.0
-Release:       4
+Version:       4.17.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: ba23b5d2403fd2f9163dfd0dadce1820
+# Source0-md5: 9da155ee8e560fd9ada8b858a73907bb
 Source1:       ftp://ftp.pld-linux.org/dists/th/PLD-3.0-Th-GPG-key.asc
 # Source1-md5: 23914bb49fafe7153cee87126d966461
 Source2:       macros.local

diff --git a/x32.patch b/x32.patch
index cdaae33396b2bc7cc510c06dbf1700836c3bd717..32b0caa08827d0808bbc8b6af9e191627961a594 100644 (file)
--- a/x32.patch
+++ b/x32.patch
@@ -52,15 +52,15 @@ 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 @@
-       host_os=`echo "${host_os}" | sed 's/-gnueabi$//'`
-       host_os_gnu=-gnueabi
+ 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
-       host_os=`echo "${host_os}" | sed 's/-gnu$//'`
+ if echo "$host_os" | grep '.*-gnu[[^-]]*$' > /dev/null ; then
+       AC_MSG_ERROR([unrecognized GNU build triplet $host_os])
  fi
 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