[packages/rpm] - renumber patches

[baggins]

commit fd15f5ab3b9aaca6046c5d110cb968d9157fcaea
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Nov 23 22:55:29 2024 +0100

    - renumber patches

 rpm.spec | 84 ++++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 42 insertions(+), 42 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index 3e976ec..43efbf9 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -57,40 +57,40 @@ Source14:	%{name}.noautoreqfiles
 Source15:	perl.prov
 Source16:	libtooldeps.sh
 Source17:	libtool.attr
-Patch1:		%{name}-popt-aliases.patch
-Patch2:		%{name}-perl-macros.patch
-Patch3:		%{name}-perl-req-perlfile.patch
-Patch4:		%{name}-scripts-closefds.patch
-Patch5:		%{name}-dir-macros-relative.patch
-Patch6:		%{name}-perl_req-INC_dirs.patch
-Patch7:		%{name}-debuginfo.patch
-Patch10:	%{name}-changelog_order_check_nonfatal.patch
-Patch11:	%{name}-postun-nofail.patch
-Patch12:	%{name}-clean-docdir.patch
-Patch13:	%{name}-perl-magic.patch
-Patch14:	%{name}-ignore-missing-macro-files.patch
-Patch15:	x32.patch
-Patch16:	rpm5-db-compat.patch
-Patch17:	python-internal-build.patch
-Patch18:	missing-macros.patch
-Patch19:	pkgconfig.patch
-Patch20:	uname-deps.patch
-Patch21:	arm_abi.patch
-Patch22:	ix86-platforms.patch
-Patch23:	shortcircuited-deps.patch
-Patch24:	cpuinfo-deps.patch
-Patch25:	rpmio-read-proc-files.patch
-Patch26:	allow-at-in-ver-rel.patch
-Patch28:	default-patch-flags.patch
-Patch30:	missing-ghost-terminate-build.patch
-Patch31:	missing-doc-terminate-build.patch
-Patch32:	noexpand.patch
-Patch34:	skip-symlinks.patch
-Patch36:	build-locale.patch
-Patch37:	no-exe-for-elf-req.patch
-Patch40:	perl-heredoc-matching.patch
-Patch41:	python-hash-type.patch
-Patch42:	dist-man.patch
+Patch0:		%{name}-popt-aliases.patch
+Patch1:		%{name}-perl-macros.patch
+Patch2:		%{name}-perl-req-perlfile.patch
+Patch3:		%{name}-scripts-closefds.patch
+Patch4:		%{name}-dir-macros-relative.patch
+Patch5:		%{name}-perl_req-INC_dirs.patch
+Patch6:		%{name}-debuginfo.patch
+Patch7:		%{name}-changelog_order_check_nonfatal.patch
+Patch8:		%{name}-postun-nofail.patch
+Patch9:		%{name}-clean-docdir.patch
+Patch10:	%{name}-perl-magic.patch
+Patch11:	%{name}-ignore-missing-macro-files.patch
+Patch12:	x32.patch
+Patch13:	rpm5-db-compat.patch
+Patch14:	python-internal-build.patch
+Patch15:	missing-macros.patch
+Patch16:	pkgconfig.patch
+Patch17:	uname-deps.patch
+Patch18:	arm_abi.patch
+Patch19:	ix86-platforms.patch
+Patch20:	shortcircuited-deps.patch
+Patch21:	cpuinfo-deps.patch
+Patch22:	rpmio-read-proc-files.patch
+Patch23:	allow-at-in-ver-rel.patch
+Patch24:	default-patch-flags.patch
+Patch25:	missing-ghost-terminate-build.patch
+Patch26:	missing-doc-terminate-build.patch
+Patch27:	noexpand.patch
+Patch28:	skip-symlinks.patch
+Patch29:	build-locale.patch
+Patch30:	no-exe-for-elf-req.patch
+Patch31:	perl-heredoc-matching.patch
+Patch32:	python-hash-type.patch
+Patch33:	dist-man.patch
 URL:		https://rpm.org/
 BuildRequires:	acl-devel
 %{?with_audit:BuildRequires:	audit-libs-devel}
@@ -634,13 +634,16 @@ 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
 %patch4 -p1
-%patch5 -p1
-%patch6 -p0
+%patch5 -p0
+%patch6 -p1
 %patch7 -p1
+%patch8 -p1
+%patch9 -p1
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
@@ -658,16 +661,13 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch24 -p1
 %patch25 -p1
 %patch26 -p1
+%patch27 -p1
 %patch28 -p1
+%patch29 -p1
 %patch30 -p1
 %patch31 -p1
 %patch32 -p1
-%patch34 -p1
-%patch36 -p1
-%patch37 -p1
-%patch40 -p1
-%patch41 -p1
-%patch42 -p1
+%patch33 -p1
 
 %{__rm} po/*.gmo
 
================================================================

---- gitweb:

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