#12 Use make macros
Closed 2 years ago by zdohnal. Opened 2 years ago by tstellar.
rpms/ tstellar/cups make-macros  into  master

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

  Name: cups

  Epoch: 1

  Version: 2.3.3

- Release: 6%{?dist}

+ Release: 7%{?dist}

  License: ASL 2.0 with exceptions for GPL2/LGPL2

  Url: http://www.cups.org/

  Source0: https://github.com/apple/cups/releases/download/v%{VERSION}/cups-%{VERSION}-source.tar.gz
@@ -389,10 +389,10 @@ 

  	localedir=%{_datadir}/locale

  

  # If we got this far, all prerequisite libraries must be here.

- make %{?_smp_mflags}

+ %make_build

  

  %install

- make BUILDROOT=%{buildroot} install

+ %make_install

  

  rm -rf	%{buildroot}%{_initddir} \

  	%{buildroot}%{_sysconfdir}/init.d \
@@ -755,6 +755,10 @@ 

  %{_mandir}/man7/ippevepcl.7.gz

  

  %changelog

+ * Mon Jul 13 2020 Tom Stellard <tstellar@redhat.com> - 1:2.3.3-7

+ - Use make macros

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

+ 

  * Thu Jun 11 2020 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.3.3-6

  - fix patch errors in failover patch

  - cgi script creates a bad uri in web ui

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.

The pull request conflicts with the current master branch, I'll apply it manually.

Pull-Request has been closed by zdohnal

2 years ago

@tstellar

The macro %make_install breaks build - CUPS installs several directories as different user than root - as user lp. Using the macro causes permission error, because it sets INSTALL env variable to 'install -p'.

If I use %make_install macro contents without setting INSTALL:

%{__make} install DESTDIR=%{?buildroot}

, the build passes. I don't know why setting INSTALL (it uses the same 'install' in the end) can influence the possibility to install a directory as a different user. Would you mind helping me?

It looks like cups uses its own install-sh script to install files and setting INSTALL=install -p overrides that. So, I don't think we can use %make_install for cups.