[packages/rpm] - stick to rpm v4 package format for now

baggins baggins at pld-linux.org
Thu Jan 1 22:46:09 CET 2026


commit 7a667c50d9ce101d19f7ebf1dc36a4e1dce513d0
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Jan 1 23:45:32 2026 +0100

    - stick to rpm v4 package format for now

 rpm.spec        |  2 ++
 rpmformat.patch | 11 +++++++++++
 2 files changed, 13 insertions(+)
---
diff --git a/rpm.spec b/rpm.spec
index 981ba04..ad09265 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -90,6 +90,7 @@ Patch33:	disable-sysusers.patch
 Patch34:	export-interfaces-for-poldek.patch
 Patch35:	no-enforce-signatures.patch
 Patch36:	rpmpgp_legacy-git.patch
+Patch37:	rpmformat.patch
 URL:		https://rpm.org/
 BuildRequires:	acl-devel
 %{?with_audit:BuildRequires:	audit-libs-devel}
@@ -650,6 +651,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch -P33 -p1
 %patch -P34 -p1
 %patch -P35 -p1
+%patch -P37 -p1
 
 # generate Group translations to *.po
 awk -f %{SOURCE6} %{SOURCE5}
diff --git a/rpmformat.patch b/rpmformat.patch
new file mode 100644
index 0000000..db2d1ae
--- /dev/null
+++ b/rpmformat.patch
@@ -0,0 +1,11 @@
+--- rpm-6.0.1/macros.in~	2026-01-01 23:40:10.000000000 +0100
++++ rpm-6.0.1/macros.in	2026-01-01 23:42:05.806666596 +0100
+@@ -266,7 +266,7 @@
+ %_rpmfilename		%{_build_name_fmt}
+ 
+ #	Which rpm format go generate (4 or 6)
+-%_rpmformat 6
++%_rpmformat 4
+ 
+ #	The directory where sources/patches from a source package will be
+ #	installed. This is also where sources/patches are found when building.
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list