From e5c37696a6baf742952604eb2b7fae992002972f Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Wed, 22 Jun 2022 09:51:06 +0300
Subject: [PATCH] Rebase to 1.19-rc1

Details at https://github.com/rpm-software-management/popt/releases/tag/popt-1.19-rc1

While at it, remove manual .la cleanup, it's automatic nowadays
and add a guard against accidental soname changes.
---
 popt.spec | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/popt.spec b/popt.spec
index cc6c659..0597662 100644
--- a/popt.spec
+++ b/popt.spec
@@ -1,15 +1,15 @@
-%define ver 1.18
-#define snap rc1
+%define ver 1.19
+%define snap rc1
 %define srcver %{ver}%{?snap:-%{snap}}
+%define sover 0
 
 Summary:        C library for parsing command line parameters
 Name:           popt
 Version:        %{ver}%{?snap:~%{snap}}
-Release:        7%{?dist}
+Release:        1%{?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
@@ -53,9 +53,6 @@ Install it if you need to link statically with libpopt.
 %install
 %make_install
 
-# Don't install any libtool .la files
-rm -f $RPM_BUILD_ROOT%{_libdir}/libpopt.la
-
 # Multiple popt configurations are possible
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/popt.d/
 
@@ -64,13 +61,10 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/popt.d/
 %check
 make check || (cat tests/*.log; exit 1)
 
-%ldconfig_scriptlets
-
 %files -f %{name}.lang
 %license COPYING
-%doc CHANGES
 %{_sysconfdir}/popt.d/
-%{_libdir}/libpopt.so.*
+%{_libdir}/libpopt.so.%{sover}*
 
 %files devel
 %doc README
@@ -85,6 +79,11 @@ make check || (cat tests/*.log; exit 1)
 %endif
 
 %changelog
+* Wed Jun 22 2022 Panu Matilainen <pmatilai@redhat.com> - 1.19~rc1-1
+- Rebase to 1.19-rc1 (https://github.com/rpm-software-management/popt/releases/tag/popt-1.19-rc1)
+- Remove manual .la cleanup, it's automatic nowadays
+- Add a guard against accidental soname changes
+
 * Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.18-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild