[packages/rpm/dev-4.18] - update to 4.18.2

[baggins]

commit adad19b2b9cf6bf62386891873d4abff935abf3e
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Nov 22 22:33:39 2024 +0100

    - update to 4.18.2

 rpm-label.patch  | 11 -----------
 rpm-man_pl.patch | 10 ----------
 rpm.spec         |  8 ++------
 3 files changed, 2 insertions(+), 27 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index ab07beb..d7c7115 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -32,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.1
+Version:	4.18.2
 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:	8acad8cd852256b152abc9fa33729f3d
+# Source0-md5:	471f5ef532e7f41ff109994cfa959b9e
 Source1:	ftp://ftp.pld-linux.org/dists/th/PLD-3.0-Th-GPG-key.asc
 # Source1-md5:	23914bb49fafe7153cee87126d966461
 Source2:	macros.local
@@ -57,7 +57,6 @@ Source14:	%{name}.noautoreqfiles
 Source15:	perl.prov
 Source16:	libtooldeps.sh
 Source17:	libtool.attr
-Patch0:		%{name}-man_pl.patch
 Patch1:		%{name}-popt-aliases.patch
 Patch2:		%{name}-perl-macros.patch
 Patch3:		%{name}-perl-req-perlfile.patch
@@ -89,7 +88,6 @@ 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
@@ -635,7 +633,6 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 
 %prep
 %setup -q -n %{name}-%{version}%{?subver}
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -667,7 +664,6 @@ 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
diff --git a/rpm-label.patch b/rpm-label.patch
deleted file mode 100644
index f301c16..0000000
--- a/rpm-label.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-"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/rpm-man_pl.patch b/rpm-man_pl.patch
deleted file mode 100644
index 8ed712f..0000000
--- a/rpm-man_pl.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- rpm-4.16.0/docs/man/pl/rpm.8.orig	2020-05-28 12:04:25.022136604 +0200
-+++ rpm-4.16.0/docs/man/pl/rpm.8	2020-10-13 08:06:11.442087617 +0200
-@@ -318,6 +318,7 @@
- Instaluje pakiety nawet je\[u015B]li niekt\['o]re z nich s\[u0105]
- ju\[u017C] zainstalowane na tym systemie.
- .TP
-+\fB--test\fR
- Nie instaluje pakietu, po prostu sprawdza i raportuje potencjalne
- konflikty.
- .SS OPCJE USUWANIA
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/adad19b2b9cf6bf62386891873d4abff935abf3e