[packages/rpm] - update remaining patches, remove obsolete patches

[baggins]

commit 4a818ee758793c465ec4c396f0b4ff09b1e95f65
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Nov 25 23:04:08 2024 +0100

    - update remaining patches, remove obsolete patches

 build-locale.patch                |  8 ++++----
 dist-man.patch                    | 11 -----------
 missing-doc-terminate-build.patch | 17 ++++++++++-------
 noexpand.patch                    |  4 ++--
 python-hash-type.patch            | 20 --------------------
 rpm.spec                          | 10 +++-------
 6 files changed, 19 insertions(+), 51 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index 351dd31..18cf49e 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -83,8 +83,6 @@ Patch27:	noexpand.patch
 Patch28:	skip-symlinks.patch
 Patch29:	build-locale.patch
 Patch30:	no-exe-for-elf-req.patch
-Patch32:	python-hash-type.patch
-Patch33:	dist-man.patch
 URL:		https://rpm.org/
 BuildRequires:	acl-devel
 %{?with_audit:BuildRequires:	audit-libs-devel}
@@ -629,13 +627,11 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch23 -p1
 %patch24 -p1
 %patch25 -p1
-#%patch26 -p1
-#%patch27 -p1
+%patch26 -p1
+%patch27 -p1
 %patch28 -p1
-#%patch29 -p1
+%patch29 -p1
 %patch30 -p1
-#%patch32 -p1
-#%patch33 -p1
 
 #%{__rm} po/*.gmo
 
diff --git a/build-locale.patch b/build-locale.patch
index 85687ae..030f190 100644
--- a/build-locale.patch
+++ b/build-locale.patch
@@ -4,12 +4,12 @@
    RPM_PACKAGE_VERSION=\"%{VERSION}\"\
    RPM_PACKAGE_RELEASE=\"%{RELEASE}\"\
    export RPM_PACKAGE_NAME RPM_PACKAGE_VERSION RPM_PACKAGE_RELEASE\
-+  LC_ALL=C\
++  LC_ALL=@C_LOCALE@\
 +  export LC_ALL\
-   LANG=C\
+   LANG=@C_LOCALE@\
    export LANG\
 -  unset CDPATH DISPLAY ||:\
 +  unset CDPATH DISPLAY LANGUAGE LINGUAS PERL_MM_OPT ||:\
    unset DEBUGINFOD_URLS ||:\
-   %{?buildroot:RPM_BUILD_ROOT=\"%{buildroot}\"\
-   export RPM_BUILD_ROOT}\
+   unset RPM_CONFIG_DIR ||:\
+   RPM_BUILD_ROOT=\"%{buildroot}\"\
diff --git a/dist-man.patch b/dist-man.patch
deleted file mode 100644
index 18c7957..0000000
--- a/dist-man.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- rpm-4.18.2/docs/Makefile.am.orig	2023-11-13 13:18:27.695107693 +0100
-+++ rpm-4.18.2/docs/Makefile.am	2024-11-23 12:53:58.103081224 +0100
-@@ -1,8 +1,6 @@
- ## Process this file with automake to produce Makefile.in
- 
--if PANDOC
- SUBDIRS = man
--endif
- 
- EXTRA_DIST =
- 
diff --git a/missing-doc-terminate-build.patch b/missing-doc-terminate-build.patch
index 6cc7732..b13f202 100644
--- a/missing-doc-terminate-build.patch
+++ b/missing-doc-terminate-build.patch
@@ -1,13 +1,16 @@
 --- rpm-4.16.0/build/files.c.orig	2020-12-18 19:36:49.000000000 +0100
 +++ rpm-4.16.0/build/files.c	2020-12-18 19:48:35.711529643 +0100
-@@ -2394,14 +2394,16 @@
- 	appendStringBuf(docScript, efn);
- 	appendStringBuf(docScript, " $");
- 	appendStringBuf(docScript, sdenv);
--	appendLineStringBuf(docScript, " ||:");
- 	free(efn);
+@@ -2394,17 +2394,19 @@
+ 		appendStringBuf(docScript, argv[j]);
+ 		appendStringBuf(docScript, "' $");
+ 		appendStringBuf(docScript, sdenv);
+-		appendLineStringBuf(docScript, " ||:");
+ 	    }
+ 	}
+ 	free(origfile);
+ 	files[i] = argv;
      }
- 
+     free(basepath);
      if (install) {
 +	int _missing_doc_files_terminate_build =
 +	    rpmExpandNumeric("%{?_missing_doc_files_terminate_build}");
diff --git a/noexpand.patch b/noexpand.patch
index 1a1a5b4..e75a513 100644
--- a/noexpand.patch
+++ b/noexpand.patch
@@ -36,10 +36,10 @@ diff -ur rpm-4.16.0/build/rpmbuild_internal.h rpm-4.16.0-noexpand/build/rpmbuild
 --- rpm-4.16.0/build/rpmbuild_internal.h	2020-12-18 20:09:28.354868788 +0100
 +++ rpm-4.16.0-noexpand/build/rpmbuild_internal.h	2020-12-18 20:09:09.054827168 +0100
 @@ -246,6 +246,7 @@
+ #define STRIP_NOTHING             0
  #define STRIP_TRAILINGSPACE (1 << 0)
  #define STRIP_COMMENTS      (1 << 1)
- #define STRIP_PARSED        (1 << 2) /* Avoid adding to spec->parsed (hack) */
-+#define STRIP_NOEXPAND      (1 << 3)
++#define STRIP_NOEXPAND      (1 << 2)
  
  #define ALLOW_EMPTY         (1 << 16)
  
diff --git a/python-hash-type.patch b/python-hash-type.patch
deleted file mode 100644
index 2b2de68..0000000
--- a/python-hash-type.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- rpm-4.18.2/python/header-py.c.orig	2023-11-13 13:18:27.000000000 +0100
-+++ rpm-4.18.2/python/header-py.c	2024-11-23 10:43:56.360696347 +0100
-@@ -316,10 +316,17 @@
-                                  "(Oi)", s, RPMTAG_NEVR);
- }
- 
-+#if __BITS_PER_LONG == 64
- static long hdr_hash(PyObject * h)
- {
-     return (long) h;
- }
-+#else
-+static int hdr_hash(PyObject * h)
-+{
-+    return (int) h;
-+}
-+#endif
- 
- static PyObject * hdr_reduce(hdrObject *s)
- {
================================================================

---- gitweb:

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