[packages/rpm/rpm6] - build fixes

[baggins]

commit ad736bac61f29a984b0dc3c795eb35e70188fab4
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Sep 29 01:01:18 2025 +0200

    - build fixes

 cpuinfo-deps.patch          |  2 +-
 rpm.spec                    | 27 ++++++++++++++-------------
 rpmio-read-proc-files.patch |  2 +-
 uname-deps.patch            | 11 +++++++++--
 4 files changed, 25 insertions(+), 17 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index ab8b73a..c640476 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -615,7 +615,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 źrodeł RPM-a przez doxygen.
 
 %prep
-%setup -q -a100 -n %{name}-%{version}%{?subver}
+%setup -q %{!?with_sequoia:-a100} -n %{name}-%{version}%{?subver}
 %patch -P 0 -p1
 %patch -P 3 -p1
 %patch -P 4 -p1
@@ -648,7 +648,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 # generate Group translations to *.po
 awk -f %{SOURCE6} %{SOURCE5}
 
-ln -s ../rpmpgp_legacy-1.1 rpmio/rpmpgp_legacy
+%{!?with_sequoia:ln -s ../rpmpgp_legacy-1.1 rpmio/rpmpgp_legacy}
 
 # rpm checks for CPU type at runtime, but it looks better
 %{__sed} -i \
@@ -744,6 +744,7 @@ cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/PLD-3.0-Th-GPG-key.as
 %endif
 
 %{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/platform/alpha*-linux/macros
+%{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/platform/e2k*-linux/macros
 %{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/platform/ia64-linux/macros
 %{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/platform/loongarch64-linux/macros
 %{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/platform/mips*-linux/macros
@@ -877,8 +878,8 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 %{_mandir}/man8/rpm.8*
 %{_mandir}/man8/rpmdb.8*
 %{_mandir}/man8/rpmkeys.8*
-%{_mandir}/man8/rpmsort.8*
-%{_mandir}/man8/rpm-misc.8*
+%{_mandir}/man1/rpmsort.1*
+#%{_mandir}/man1/rpm-misc.1*
 %{?with_plugins:%{_mandir}/man8/rpm-plugins.8*}
 
 %dir /var/lib/rpm
@@ -974,10 +975,10 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 %attr(755,root,root) %{_rpmlibdir}/rpm2cpio.sh
 %attr(755,root,root) %{_rpmlibdir}/tgpg
 %attr(755,root,root) %{_rpmlibdir}/rpmdeps
-%{_mandir}/man8/rpm2archive.8*
-%{_mandir}/man8/rpm2cpio.8*
-%{_mandir}/man8/rpmdeps.8*
-%{_mandir}/man8/rpmgraph.8*
+%{_mandir}/man1/rpm2archive.1*
+%{_mandir}/man1/rpm2cpio.1*
+%{_mandir}/man1/rpmdeps.1*
+%{_mandir}/man1/rpmgraph.1*
 
 %files build
 %defattr(644,root,root,755)
@@ -1021,9 +1022,9 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 %attr(755,root,root) %{_bindir}/rpmspec
 
 %{_mandir}/man1/gendiff.1*
-%{_mandir}/man8/rpmbuild.8*
-%{_mandir}/man8/rpmlua.8*
-%{_mandir}/man8/rpmspec.8*
+%{_mandir}/man1/rpmbuild.1*
+%{_mandir}/man1/rpmlua.1*
+%{_mandir}/man1/rpmspec.1*
 
 %if %{with python3}
 %files -n python3-rpm
@@ -1109,10 +1110,10 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 %files sign
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/rpmsign
-%{_mandir}/man8/rpmsign.8*
+%{_mandir}/man1/rpmsign.1*
 
 %if %{with apidocs}
 %files apidocs
 %defattr(644,root,root,755)
-%doc docs/html/*
+#%doc docs/html/*
 %endif
diff --git a/cpuinfo-deps.patch b/cpuinfo-deps.patch
index a201ca9..d3c6b6b 100644
--- a/cpuinfo-deps.patch
+++ b/cpuinfo-deps.patch
@@ -36,7 +36,7 @@ diff -ur rpm-4.16.0/lib/rpmds.cc rpm-4.16.0-cpuinfo/lib/rpmds.cc
  #include <rpm/rpmbase64.h>
 +#include <rpm/rpmmacro.h>
 +
-+#include "rpmio_internal.h"	/* XXX for rpmioSlurp */
++#include "rpmio_internal.hh"	/* XXX for rpmioSlurp */
  
  #include "rpmds_internal.hh"
  
diff --git a/rpmio-read-proc-files.patch b/rpmio-read-proc-files.patch
index 6407cb2..49cef0a 100644
--- a/rpmio-read-proc-files.patch
+++ b/rpmio-read-proc-files.patch
@@ -9,7 +9,7 @@
 +    /* XXX glibc mmap'd libio no workie for /proc files on linux?!? */
 +    else if (!strncmp(fn, "/proc/", sizeof("/proc/")-1)) {
 +	blen = blenmax;
-+	b = xmalloc(blen+1);
++	b = (uint8_t *)xmalloc(blen+1);
 +	b[0] = '\0';
 +
 +	size = read(Fileno(fd), b, blen);
diff --git a/uname-deps.patch b/uname-deps.patch
index cf48eaa..9d3334f 100644
--- a/uname-deps.patch
+++ b/uname-deps.patch
@@ -2,11 +2,18 @@ diff --git a/lib/depends.cc b/lib/depends.cc
 index 28a4a784d..1d8ce1f8a 100644
 --- a/lib/depends.cc
 +++ b/lib/depends.cc
-@@ -690,6 +690,17 @@ retry:
+@@ -663,6 +663,7 @@
+ 
+ retry:
+     rc = 0;	/* assume dependency is satisfied */
++    const char * N = rpmdsN(dep);
+ 
+     /*
+      * New features in rpm packaging implicitly add versioned dependencies
+@@ -690,6 +690,16 @@ retry:
  	goto unsatisfied;
      }
  
-+    char * N = rpmdsN(dep);
 +    if (strstr(N, "uname(") == N) {
 +	if (tsmem->uname == NULL)
 +	    rpmdsUnamePool(rpmtsPool(ts), &(tsmem->uname));
================================================================

---- gitweb:

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