Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/popt.git#cc9c1c577d0bb85f3aba6242ef2c7991af538163

popt.spec

@@ -5,13 +5,13 @@
 Summary:        C library for parsing command line parameters
 Name:           popt
 Version:        %{ver}%{?snap:~%{snap}}
-Release:        3%{?dist}
+Release:        4%{?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
-BuildRequires: make
 BuildRequires:  gcc
 BuildRequires:  gettext
+BuildRequires:  make
 
 %description
 Popt is a C library for parsing command line parameters. Popt was
@@ -32,6 +32,7 @@ The popt-devel package includes header files and libraries necessary
 for developing programs which use the popt C library. It contains the
 API documentation of the popt library, too.
 
+%if 0%{!?_without_static:1}
 %package static
 Summary:        Static library for parsing command line parameters
 Requires:       %{name}-devel%{?_isa} = %{version}-%{release}
@@ -39,12 +40,13 @@ Requires:       %{name}-devel%{?_isa} = %{version}-%{release}
 %description static
 The popt-static package includes static libraries of the popt library.
 Install it if you need to link statically with libpopt.
+%endif
 
 %prep
 %autosetup -n %{name}-%{srcver}
 
 %build
-%configure
+%configure %{?_without_static:--disable-static}
 %make_build
 
 %install
@@ -76,10 +78,15 @@ make check
 %{_includedir}/popt.h
 %{_mandir}/man3/popt.3*
 
+%if 0%{!?_without_static:1}
 %files static
 %{_libdir}/libpopt.a
+%endif
 
 %changelog
+* Sat Mar 06 2021 Robert Scheck <robert@fedoraproject.org> 1.18-4
+- Conditionalize static subpackage during build-time
+
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.18-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild