From 3a6f3a72bb88b2c364ff94b5252d612839ae27ba Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Wed, 23 Jun 2021 10:57:18 +0300
Subject: [PATCH] Fix test-suite expectations on rawhide

Also make test-suite failures debuggable
---
 popt.spec | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/popt.spec b/popt.spec
index 75faae3..8fa3d20 100644
--- a/popt.spec
+++ b/popt.spec
@@ -5,10 +5,11 @@
 Summary:        C library for parsing command line parameters
 Name:           popt
 Version:        %{ver}%{?snap:~%{snap}}
-Release:        4%{?dist}
+Release:        5%{?dist}
 License:        MIT
 URL:            https://github.com/rpm-software-management/popt/
 Source0:        http://ftp.rpm.org/popt/releases/popt-1.x/%{name}-%{srcver}.tar.gz
+Patch0:		popt-1.18-ltname.patch
 BuildRequires:  gcc
 BuildRequires:  gettext
 BuildRequires:  make
@@ -43,7 +44,7 @@ Install it if you need to link statically with libpopt.
 %endif
 
 %prep
-%autosetup -n %{name}-%{srcver}
+%autosetup -n %{name}-%{srcver} -p1
 
 %build
 %configure %{?_without_static:--disable-static}
@@ -61,7 +62,7 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/popt.d/
 %find_lang %{name}
 
 %check
-make check
+make check || cat tests/*.log
 
 %ldconfig_scriptlets
 
@@ -84,6 +85,10 @@ make check
 %endif
 
 %changelog
+* Wed Jun 23 2021 Panu Matilainen <pmatilai@redhat.com> - 1.18-5
+- Fix test-suite expectation on rawhide
+- Dump test-suite logs for post-mortem on failure
+
 * Sat Mar 06 2021 Robert Scheck <robert@fedoraproject.org> 1.18-4
 - Conditionalize static subpackage during build-time