[packages/rpm/dev-4.18] - updated to 4.18.1
qboosh
qboosh at pld-linux.org
Fri Sep 29 17:33:27 CEST 2023
commit 3698d89d5232011d0aa41851fd7321b2740e8cfe
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Fri Sep 29 17:01:35 2023 +0200
- updated to 4.18.1
build-locale.patch | 12 ++++++------
rpm-label.patch | 11 +++++++++++
rpm.spec | 26 ++++++++++++++------------
x32.patch | 13 ++++++-------
4 files changed, 37 insertions(+), 25 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index ee8a1ab..d063bed 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -14,7 +14,6 @@
%bcond_without fsverity # fsverity plugin
%define popt_ver 1.15
-%define sover 9.3.0
%if "%{_rpmversion}" >= "4.12" && "%{_rpmversion}" < "5"
%define with_recommends_tags 1
@@ -33,13 +32,13 @@ Summary(pt_BR.UTF-8): Gerenciador de pacotes RPM
Summary(ru.UTF-8): Менеджер пакетов от RPM
Summary(uk.UTF-8): Менеджер пакетів від RPM
Name: rpm
-Version: 4.18.0
+Version: 4.18.1
Release: 0.1
Epoch: 1
License: GPL v2 / LGPL v2.1
Group: Base
Source0: http://ftp.rpm.org/releases/rpm-4.18.x/%{name}-%{version}.tar.bz2
-# Source0-md5: e7b83cedbdbeac1f950d62ee349416a2
+# Source0-md5: 8acad8cd852256b152abc9fa33729f3d
Source1: ftp://ftp.pld-linux.org/dists/th/PLD-3.0-Th-GPG-key.asc
# Source1-md5: 23914bb49fafe7153cee87126d966461
Source2: macros.local
@@ -90,6 +89,7 @@ Patch30: missing-ghost-terminate-build.patch
Patch31: missing-doc-terminate-build.patch
Patch32: noexpand.patch
Patch34: skip-symlinks.patch
+Patch35: %{name}-label.patch
Patch36: build-locale.patch
Patch37: no-exe-for-elf-req.patch
Patch38: gem-in-package-builddir.patch
@@ -667,6 +667,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
%patch31 -p1
%patch32 -p1
%patch34 -p1
+%patch35 -p1
%patch36 -p1
%patch37 -p1
#%patch38 -p1
@@ -834,8 +835,9 @@ done
%if %{with python3}
# Remove anything that rpm make install might put there
-%{__rm} -rf $RPM_BUILD_ROOT%{py3_sitedir}
cd python
+%{__rm} -rf rpm.egg-info
+%{__rm} -rf $RPM_BUILD_ROOT%{py3_sitedir}
%py3_install
cd ..
%endif
@@ -981,14 +983,14 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
%files lib
%defattr(644,root,root,755)
-%attr(755,root,root) /%{_lib}/librpm.so.9
-%attr(755,root,root) /%{_lib}/librpm.so.%{sover}
-%attr(755,root,root) /%{_lib}/librpmbuild.so.9
-%attr(755,root,root) /%{_lib}/librpmbuild.so.%{sover}
-%attr(755,root,root) /%{_lib}/librpmio.so.9
-%attr(755,root,root) /%{_lib}/librpmio.so.%{sover}
-%attr(755,root,root) /%{_lib}/librpmsign.so.9
-%attr(755,root,root) /%{_lib}/librpmsign.so.%{sover}
+%attr(755,root,root) %ghost /%{_lib}/librpm.so.9
+%attr(755,root,root) /%{_lib}/librpm.so.*.*.*
+%attr(755,root,root) %ghost /%{_lib}/librpmbuild.so.9
+%attr(755,root,root) /%{_lib}/librpmbuild.so.*.*.*
+%attr(755,root,root) %ghost /%{_lib}/librpmio.so.9
+%attr(755,root,root) /%{_lib}/librpmio.so.*.*.*
+%attr(755,root,root) %ghost /%{_lib}/librpmsign.so.9
+%attr(755,root,root) /%{_lib}/librpmsign.so.*.*.*
%{?with_plugins:%dir %{_libdir}/rpm-plugins}
%files devel
diff --git a/build-locale.patch b/build-locale.patch
index 49a846b..85687ae 100644
--- a/build-locale.patch
+++ b/build-locale.patch
@@ -1,6 +1,6 @@
---- rpm-4.16.1.2.org/macros.in 2021-02-25 08:15:48.438647368 +0100
-+++ rpm-4.16.1.2/macros.in 2021-02-25 08:18:39.103948354 +0100
-@@ -818,9 +818,11 @@ package or when debugging this package.\
+--- rpm-4.18.1/macros.in.orig 2023-09-28 20:57:49.785633725 +0200
++++ rpm-4.18.1/macros.in 2023-09-28 21:11:58.121037898 +0200
+@@ -741,9 +741,11 @@ package or when debugging this package.\
RPM_PACKAGE_VERSION=\"%{VERSION}\"\
RPM_PACKAGE_RELEASE=\"%{RELEASE}\"\
export RPM_PACKAGE_NAME RPM_PACKAGE_VERSION RPM_PACKAGE_RELEASE\
@@ -9,7 +9,7 @@
LANG=C\
export LANG\
- unset CDPATH DISPLAY ||:\
-+ unset CDPATH DISPLAY LANGUAGE LINGUAS PERL_MM_OPT||:\
- %{?buildroot:RPM_BUILD_ROOT=\"%{u2p:%{buildroot}}\"\
++ unset CDPATH DISPLAY LANGUAGE LINGUAS PERL_MM_OPT ||:\
+ unset DEBUGINFOD_URLS ||:\
+ %{?buildroot:RPM_BUILD_ROOT=\"%{buildroot}\"\
export RPM_BUILD_ROOT}\
- %{?_javaclasspath:CLASSPATH=\"%{_javaclasspath}\"\
diff --git a/rpm-label.patch b/rpm-label.patch
new file mode 100644
index 0000000..f301c16
--- /dev/null
+++ b/rpm-label.patch
@@ -0,0 +1,11 @@
+"label must be followed by statement and declaration is not statement"
+--- rpm-4.18.1/lib/fsm.c.orig 2023-03-13 15:33:50.024223032 +0100
++++ rpm-4.18.1/lib/fsm.c 2023-09-28 21:28:46.288909517 +0200
+@@ -1015,6 +1015,7 @@
+ }
+
+ setmeta:
++ ;
+ /* Special files require path-based ops */
+ int mayopen = S_ISREG(fp->sb.st_mode) || S_ISDIR(fp->sb.st_mode);
+ if (!rc && fd == -1 && mayopen) {
diff --git a/x32.patch b/x32.patch
index cef1f63..8f9c068 100644
--- a/x32.patch
+++ b/x32.patch
@@ -1,7 +1,6 @@
-diff -ur rpm-4.16.1.2/build/rpmfc.c rpm-4.16.1.2.x32/build/rpmfc.c
---- rpm-4.16.1.2/build/rpmfc.c 2021-03-21 21:51:28.231530270 +0100
-+++ rpm-4.16.1.2.x32/build/rpmfc.c 2021-03-21 21:50:04.127398387 +0100
-@@ -641,6 +641,7 @@
+--- rpm-4.18.1/build/rpmfc.c.orig 2023-09-28 20:44:47.296539499 +0200
++++ rpm-4.18.1/build/rpmfc.c 2023-09-28 20:56:50.552621285 +0200
+@@ -648,6 +648,7 @@ static const struct rpmfcTokens_s rpmfcT
{ "ELF 32-bit", RPMFC_ELF32|RPMFC_INCLUDE },
{ "ELF 64-bit", RPMFC_ELF64|RPMFC_INCLUDE },
@@ -9,7 +8,7 @@ diff -ur rpm-4.16.1.2/build/rpmfc.c rpm-4.16.1.2.x32/build/rpmfc.c
{ "troff or preprocessor input", RPMFC_INCLUDE },
{ "GNU Info", RPMFC_INCLUDE },
-@@ -746,7 +747,11 @@
+@@ -753,7 +754,11 @@ static rpm_color_t rpmfcColor(const char
if (strstr(fmstr, fct->token) == NULL)
continue;
@@ -22,7 +21,7 @@ diff -ur rpm-4.16.1.2/build/rpmfc.c rpm-4.16.1.2.x32/build/rpmfc.c
if (fcolor & RPMFC_INCLUDE)
break;
}
-@@ -1147,7 +1152,10 @@
+@@ -1149,7 +1154,10 @@ static uint32_t getElfColor(const char *
color = RPMFC_ELF64;
break;
case ELFCLASS32:
@@ -33,7 +32,7 @@ diff -ur rpm-4.16.1.2/build/rpmfc.c rpm-4.16.1.2.x32/build/rpmfc.c
+ color = RPMFC_ELF32;
break;
}
- elf_end(elf);
+ }
diff -ur rpm-4.16.1.2/include/rpm/rpmfc.h rpm-4.16.1.2.x32/include/rpm/rpmfc.h
--- rpm-4.16.1.2/include/rpm/rpmfc.h 2020-05-28 12:04:25.011136544 +0200
+++ rpm-4.16.1.2.x32/include/rpm/rpmfc.h 2021-03-21 21:50:04.127398387 +0100
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/3698d89d5232011d0aa41851fd7321b2740e8cfe
More information about the pld-cvs-commit
mailing list