diff options
| author | Tomas Mraz <tmraz@fedoraproject.org> | 2020-10-12 17:25:51 +0200 |
|---|---|---|
| committer | Tomas Mraz <tmraz@fedoraproject.org> | 2020-10-12 17:25:51 +0200 |
| commit | 02e67288e532e1caf2326efe0bebb6dd4e80dafd (patch) | |
| tree | f7e5dd054eab0d7cccc1b99eda69ae6dcbbc0f12 | |
| parent | 4cedb2e12a8b965d2ca45a90ef29344a75b67b6e (diff) | |
| download | libpwquality-git-02e67288e532e1caf2326efe0bebb6dd4e80dafd.tar.gz | |
Use make macros in rpm spec file
| -rw-r--r-- | libpwquality.spec.in | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/libpwquality.spec.in b/libpwquality.spec.in index a95636b..c27bfd7 100644 --- a/libpwquality.spec.in +++ b/libpwquality.spec.in @@ -36,6 +36,7 @@ BuildRequires: python2-devel %endif %if %{with python3} BuildRequires: python3-devel +BuildRequires: python3-setuptools %endif URL: https://github.com/libpwquality/libpwquality/ @@ -100,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} @@ -112,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 @@ -183,6 +184,10 @@ mkdir $RPM_BUILD_ROOT%{_secconfdir}/pwquality.conf.d - Add usersubstr check for substrings of N characters from the username patch by Danny Sauer +* Mon Jul 13 2020 Tom Stellard <tstellar@redhat.com> - 1.4.2-4 +- Use make macros +- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro + * Thu Oct 31 2019 Tomáš Mráz <tmraz@redhat.com> 1.4.2-1 - Fix previous release regression in handling retry, enforce_for_root, and local_users_only options |