From 24d1ecd259cfcf686660cada39b537a5bc4e47da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
Date: Wed, 1 Dec 2021 19:17:24 +0100
Subject: [PATCH] Switch to %autosetup

Renumber high numbered patches to two digits patch. It does not really
matter for autosetup. Simplify applying of new patches.
---
 bind.spec | 44 ++++++++++++++++----------------------------
 1 file changed, 16 insertions(+), 28 deletions(-)

diff --git a/bind.spec b/bind.spec
index ef10977..2aa155c 100644
--- a/bind.spec
+++ b/bind.spec
@@ -88,23 +88,24 @@ Source49: named-chroot.files
 # Common patches
 Patch10: bind-9.5-PIE.patch
 Patch16: bind-9.16-redhat_doc.patch
-Patch72: bind-9.5-dlz-64bit.patch
-Patch106:bind93-rh490837.patch
-Patch112:bind97-rh645544.patch
-Patch130:bind-9.9.1-P2-dlz-libdb.patch
+Patch20: bind-9.5-dlz-64bit.patch
+# https://gitlab.isc.org/isc-projects/bind9/-/merge_requests/5601
+Patch21: bind93-rh490837.patch
+Patch22: bind-9.11-fips-tests.patch
+Patch23: bind97-rh645544.patch
+Patch24: bind-9.9.1-P2-dlz-libdb.patch
 # Make PKCS11 used only for pkcs11 parts
-Patch135:bind-9.14-config-pkcs11.patch
+Patch70: bind-9.14-config-pkcs11.patch
 # Fedora specific patch to distribute native-pkcs#11 functionality
-Patch136:bind-9.10-dist-native-pkcs11.patch
+Patch71: bind-9.10-dist-native-pkcs11.patch
 # Do not use isc-pkcs11.
-Patch149:bind-9.11-kyua-pkcs11.patch
+Patch72: bind-9.11-kyua-pkcs11.patch
 
-Patch157:bind-9.11-fips-tests.patch
 # https://gitlab.isc.org/isc-projects/bind9/-/merge_requests/2689
-Patch164:bind-9.11-rh1666814.patch
+Patch25:bind-9.11-rh1666814.patch
 # https://gitlab.isc.org/isc-projects/bind9/-/merge_requests/5795
-Patch167:bind-9.16-hp-workers-rh2048235.patch
-Patch168:bind-9.16-hp-workers-rh2048235-dyndb.patch
+Patch26:bind-9.16-hp-workers-rh2048235.patch
+Patch27:bind-9.16-hp-workers-rh2048235-dyndb.patch
 
 %{?systemd_ordering}
 Requires:       coreutils
@@ -392,28 +393,15 @@ in HTML and PDF format.
 # RHEL does not yet support this verification
 %{gpgverify} --keyring='%{SOURCE4}' --signature='%{SOURCE2}' --data='%{SOURCE0}'
 %endif
-%setup -q
-
-# Common patches
-%patch10 -p1 -b .PIE
-%patch16 -p1 -b .redhat_doc
-%patch72 -p1 -b .64bit
-%patch106 -p1 -b .rh490837
-%patch112 -p1 -b .rh645544
-%patch130 -p1 -b .libdb
-%patch157 -p1 -b .fips-tests
-%patch164 -p1 -b .rh1666814
-%patch167 -p1 -b .rh2048235
-%patch168 -p1 -b .rh2048235-dyndb
-
+%autosetup -n %{name}-%{version} -p1 -N
+%autopatch -p1 -M 69
 %if %{with PKCS11}
-%patch135 -p1 -b .config-pkcs11
+%autopatch -m 70 -M 70
 cp -r bin/named{,-pkcs11}
 cp -r bin/dnssec{,-pkcs11}
 cp -r lib/dns{,-pkcs11}
 cp -r lib/ns{,-pkcs11}
-%patch136 -p1 -b .dist_pkcs11
-%patch149 -p1 -b .kyua-pkcs11
+%autopatch -m 71
 %endif
 
 # Sparc and s390 arches need to use -fPIE