#1 Use make macros
Merged 3 years ago by tmraz. Opened 3 years ago by tstellar.
rpms/ tstellar/libpwquality make-macros  into  master

file modified
+9 -5
@@ -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 @@ 

  	--with-python-binary=%{__python2} \

  	--disable-static

  

- make %{?_smp_mflags}

+ %make_build

  %endif

  %if %{with python3} && %{with python2}

  pushd %{py3dir}
@@ -113,18 +113,18 @@ 

  	--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 @@ 

  %endif

  

  %changelog

+ * Mon Jul 13 2020 Tom Stellard <tstellar@redhat.com> - 1.4.2-4

+ - Use make macros

+ - https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro

+ 

  * Sat May 23 2020 Miro Hrončok <mhroncok@redhat.com> - 1.4.2-3

  - Rebuilt for Python 3.9

  

This pull request was create automatically for the f33 change:
https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro

Please review the patch and if you approve the changes, merge it after the simple-koji-ci test passes.

This pull request will be automatically merged in 1 week if there are not objections.

Pull-Request has been merged by tmraz

3 years ago