From 596990e0e8121b357a07db863e06bea3fa2970c4 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Jul 13 2020 22:26:36 +0000 Subject: Use make macros https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro --- diff --git a/libpwquality.spec b/libpwquality.spec index 7d75885..ac6b6a4 100644 --- a/libpwquality.spec +++ b/libpwquality.spec @@ -15,7 +15,7 @@ Summary: A library for password generation and password quality checking Name: libpwquality Version: 1.4.2 -Release: 3%{?dist} +Release: 4%{?dist} # The package is BSD licensed with option to relicense as GPLv2+ # - this option is redundant as the BSD license allows that anyway. License: BSD or GPLv2+ @@ -101,7 +101,7 @@ cp -a . %{py3dir} --with-python-binary=%{__python2} \ --disable-static -make %{?_smp_mflags} +%make_build %endif %if %{with python3} && %{with python2} pushd %{py3dir} @@ -113,18 +113,18 @@ pushd %{py3dir} --with-python-binary=%{__python3} \ --disable-static -make %{?_smp_mflags} +%make_build %endif %if %{with python3} && %{with python2} popd %endif %install -make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' +%make_install %if %{with python3} && %{with python2} pushd %{py3dir} -make -C python install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' +%make_install -C python popd %endif @@ -179,6 +179,10 @@ mkdir $RPM_BUILD_ROOT%{_secconfdir}/pwquality.conf.d %endif %changelog +* Mon Jul 13 2020 Tom Stellard - 1.4.2-4 +- Use make macros +- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro + * Sat May 23 2020 Miro HronĨok - 1.4.2-3 - Rebuilt for Python 3.9