From fe8ec42f0c070bcacdfd34292330c76afdc4dd9be8acf9dccd51cece87a3ec81 Mon Sep 17 00:00:00 2001
From: Martin Wilck <martin.wilck@suse.com>
Date: Thu, 22 Feb 2024 18:30:14 +0000
Subject: [PATCH] Accepting request 1149016 from home:dimstar:rpm4.20:h

Prepare for RPM 4.20

OBS-URL: https://build.opensuse.org/request/show/1149016
OBS-URL: https://build.opensuse.org/package/show/Printing/hplip?expand=0&rev=248
---
 hplip.changes |  5 +++++
 hplip.spec    | 36 ++++++++++++++++++------------------
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/hplip.changes b/hplip.changes
index 5deb07b..62d3614 100644
--- a/hplip.changes
+++ b/hplip.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Feb 22 07:51:33 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Use %patch -P N instead of deprecated %patchN.
+
 -------------------------------------------------------------------
 Wed Jan  3 16:11:11 UTC 2024 - Martin Wilck <mwilck@suse.com>
 
diff --git a/hplip.spec b/hplip.spec
index 52dd46d..29f9ce2 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -308,29 +308,29 @@ This sub-package is only required by developers.
 # Be quiet when unpacking:
 %setup -q
 # Patch101 change-udev-rules.diff changes the udev rules file 56-hpmud.rules
-%patch101 -p1 -b .change-udev-rules.orig
+%patch -P 101 -p1 -b .change-udev-rules.orig
 # Patch106 disable_hp-upgrade.patch disables hp-upgrade/upgrade.py for security reasons,
 # see https://bugzilla.novell.com/show_bug.cgi?id=853405
 # To upgrade HPLIP an openSUSE software package manager like YaST or zypper should be used.
-%patch106 -p1 -b .disable_hp-upgrade.orig
-%patch107 -p1 -b .udev_rules_dir.orig
+%patch -P 106 -p1 -b .disable_hp-upgrade.orig
+%patch -P 107 -p1 -b .udev_rules_dir.orig
 # Patch108 add_missing_includes_and_define_GNU_SOURCE.patch adds missing '#include <...>'
 # and missing '#define _GNU_SOURCE' see https://bugs.launchpad.net/hplip/+bug/1456590
-%patch108 -p1 -b .add_missing_includes_and_define_GNU_SOURCE.orig
-%patch110 -p1 -b .boo1094141
-%patch112 -p1
-%patch300 -p1 -b .pcardext-python3
-%patch301 -p1 -b .misc-headers
-%patch302 -p1 -b .hp_ipp_missing_prototypes
-%patch304 -p1
-%patch305 -p1
-%patch306 -p1
-%patch400 -p1
-%patch401 -p1
-%patch402 -p1
-%patch403 -p1
-%patch404 -p1
-%patch500 -p1
+%patch -P 108 -p1 -b .add_missing_includes_and_define_GNU_SOURCE.orig
+%patch -P 110 -p1 -b .boo1094141
+%patch -P 112 -p1
+%patch -P 300 -p1 -b .pcardext-python3
+%patch -P 301 -p1 -b .misc-headers
+%patch -P 302 -p1 -b .hp_ipp_missing_prototypes
+%patch -P 304 -p1
+%patch -P 305 -p1
+%patch -P 306 -p1
+%patch -P 400 -p1
+%patch -P 401 -p1
+%patch -P 402 -p1
+%patch -P 403 -p1
+%patch -P 404 -p1
+%patch -P 500 -p1
 # replace "env" shebang and "/usr/bin/python" with real executable
 find . -name '*.py' -o -name pstotiff | \
     xargs -n 1 sed -i '1s,^#!\(%{_bindir}/env python\|%{_bindir}/python\),#!%{pyexe},'