From 0598391bf40d528a0557f9412bdcbf3dec4f2ee9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com>
Date: Tue, 16 Feb 2021 00:18:20 +0000
Subject: [PATCH] Build with fix on dpkg (#1923609) and (#1714442)

---
 debhelper-skip_archtest.patch | 25 -------------------------
 debhelper.spec                |  7 ++++---
 2 files changed, 4 insertions(+), 28 deletions(-)
 delete mode 100644 debhelper-skip_archtest.patch

diff --git a/debhelper-skip_archtest.patch b/debhelper-skip_archtest.patch
deleted file mode 100644
index 5f2c198..0000000
--- a/debhelper-skip_archtest.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://lists.debian.org/debian-dpkg/2017/07/msg00040.html
-
-The problem is that your compiler gives a different triplet than the
-one used by dpkg itself.
-
---- ./t/buildsystems/04-dh_auto_do_autoconf.t.orig	2018-09-21 19:49:13.357781723 +0100
-+++ ./t/buildsystems/04-dh_auto_do_autoconf.t	2018-09-21 20:03:14.744324612 +0100
-@@ -2,7 +2,7 @@
- 
- use strict;
- use warnings;
--use Test::More tests => 31;
-+use Test::More tests => 29;
- 
- use File::Temp qw(tempdir);
- use File::Basename qw(dirname);
-@@ -52,7 +52,7 @@ sub dh_auto_do_autoconf {
- 		@lines = @{readlines(\*FILE)};
- 		close(FILE);
- 	}
--	is_deeply( \@lines, \@extra_args, "$buildpath/stamp_configure contains extra args" );
-+	# is_deeply( \@lines, \@extra_args, "$buildpath/stamp_configure contains extra args" );
- 
- 	&$do_dh_auto('build');
- 	ok ( -f "$buildpath/stamp_build", "$buildpath/stamp_build exists" );
diff --git a/debhelper.spec b/debhelper.spec
index 9a04581..2022400 100644
--- a/debhelper.spec
+++ b/debhelper.spec
@@ -8,7 +8,7 @@
 
 Name:           debhelper
 Version:        12.7.3
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Helper programs for debian/rules
 
 License:        GPLv2+
@@ -16,7 +16,6 @@ URL:            https://tracker.debian.org/pkg/debhelper
 Source0:        http://ftp.debian.org/debian/pool/main/d/%{name}/%{name}_%{version}.tar.xz
 Patch1:         debhelper-10.2.5-ignore-dh-systemd-transitional-package.patch
 Patch2:         no_layout_deb.patch
-Patch3:         debhelper-skip_archtest.patch
 BuildArch:      noarch
 
 BuildRequires:  gcc
@@ -125,7 +124,6 @@ cc -dumpmachine
 %setup -q -n %{name}
 %patch1 -p1 -b .no-transitional-package
 %patch2 -p1 -b .no-debian-layout
-%patch3 -p1 -b .skip-arm-fail-test
 
 %build
 %make_build build
@@ -168,6 +166,9 @@ make test
 %{perl_vendorlib}/*
 
 %changelog
+* Mon Feb 15 2021 Sérgio Basto <sergio@serjux.com> - 12.7.3-8
+- Build with fix on dpkg (#1923609) and (#1714442)
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 12.7.3-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild