#7 Use make macros
Merged 2 years ago by zdohnal. Opened 2 years ago by tstellar.
rpms/ tstellar/hplip make-macros  into  master

file modified
+7 -3
@@ -7,7 +7,7 @@ 

  Summary: HP Linux Imaging and Printing Project

  Name: hplip

  Version: 3.20.6

- Release: 2%{?dist}

+ Release: 3%{?dist}

  License: GPLv2+ and MIT and BSD and IJG and Public Domain and GPLv2+ with exceptions and ISC

  

  Url: https://developers.hp.com/hp-linux-imaging-and-printing
@@ -458,12 +458,12 @@ 

          --enable-hpijs-install \

          --disable-policykit --with-mimedir=%{_datadir}/cups/mime PYTHON=%{__python3}

  

- make %{?_smp_mflags}

+ %make_build

  

  

  %install

  mkdir -p %{buildroot}%{_bindir}

- make install DESTDIR=%{buildroot} PYTHON=%{__python3}

+ %make_install PYTHON=%{__python3}

  

  # Create /run/hplip & /var/lib/hp

  mkdir -p %{buildroot}/run/hplip
@@ -725,6 +725,10 @@ 

  %config(noreplace) %{_sysconfdir}/sane.d/dll.d/hpaio

  

  %changelog

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

+ - Use make macros

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

+ 

  * Tue Jun 23 2020 Zdenek Dohnal <zdohnal@redhat.com> - 3.20.6-2

  - appdata.xml needs to be in %%{_datadir}/metainfo

  

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 zdohnal

2 years ago