From 09d84c98b04c58751f4d03fa4cc141a9f987958b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com>
Date: Tue, 21 Feb 2023 17:15:31 +0000
Subject: [PATCH] Proper fix for bad requires generated by perl-generators
 (#2171353)

---
 dpkg.spec | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/dpkg.spec b/dpkg.spec
index f5e92db..98db88d 100644
--- a/dpkg.spec
+++ b/dpkg.spec
@@ -3,7 +3,7 @@
 
 Name:           dpkg
 Version:        1.21.20
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Package maintenance system for Debian Linux
 # The entire source code is GPLv2+ with exception of the following
 # lib/dpkg/md5.c, lib/dpkg/md5.h - Public domain
@@ -61,6 +61,8 @@ Requires(post): coreutils
 # Needed for --clamp-mtime in dpkg-source -b.
 Requires:      tar >= 2:1.28
 
+# Remove bad dependencies added by perl-generators
+%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(at|extra|file\\)$
 
 %description
 This package provides the low-level infrastructure for handling the
@@ -178,19 +180,6 @@ user interfaces.
 %prep
 %autosetup -p1
 
-#fix for https://bugzilla.redhat.com/show_bug.cgi?id=2171353
-sed -i 's/use at/at/' scripts/dpkg-source.pl
-
-# Filter unwanted Requires:
-cat << \EOF > %{name}-req
-#!/bin/sh
-%{__perl_requires} $* |\
-  sed -e '/perl(Dselect::Ftp)/d' -e '/perl(extra)/d' -e '/perl(file)/d' -e '/perl(in)/d'
-EOF
-
-%define __perl_requires %{_builddir}/dpkg-%{version}/dpkg-req
-chmod +x %{__perl_requires}
-
 %build
 autoreconf
 %configure --disable-linker-optimisations \
@@ -488,6 +477,9 @@ make VERBOSE=1 TESTSUITEFLAGS=--verbose \
 
 
 %changelog
+* Tue Feb 21 2023 Sérgio Basto <sergio@serjux.com> - 1.21.20-3
+- Proper fix for bad requires generated by perl-generators (#2171353)
+
 * Mon Feb 20 2023 Sérgio Basto <sergio@serjux.com> - 1.21.20-2
 - Fix FTI, bug https://bugzilla.redhat.com/show_bug.cgi?id=2171353