diff --git a/cups.spec b/cups.spec index 5411b05..d68b467 100644 --- a/cups.spec +++ b/cups.spec @@ -22,7 +22,7 @@ Summary: CUPS printing system Name: cups Epoch: 1 Version: 2.4.7 -Release: 2%{?dist} +Release: 3%{?dist} # backend/failover.c - BSD-3-Clause # cups/md5* - Zlib # scheduler/colorman.c - Apache-2.0 WITH LLVM-exception AND BSD-2-Clause @@ -188,6 +188,7 @@ License: LGPLv2 Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} Requires: gnutls-devel Requires: krb5-devel +Requires: pkgconf-pkg-config Requires: zlib-devel %package libs @@ -791,6 +792,9 @@ rm -f %{cups_serverbin}/backend/smb %{_mandir}/man7/ippeveps.7.gz %changelog +* Mon Nov 06 2023 Zdenek Dohnal - 1:2.4.7-3 +- use pkgconfig in macros.cups and add new macros + * Mon Oct 30 2023 Zdenek Dohnal - 1:2.4.7-2 - fix memory leaks when unloading job diff --git a/macros.cups b/macros.cups index 5b560d9..c1647f8 100644 --- a/macros.cups +++ b/macros.cups @@ -1 +1,3 @@ -%_cups_serverbin %(/usr/bin/cups-config --serverbin) +%_cups_serverbin %(/usr/bin/pkg-config --variable=cups_serverbin cups) +%_cups_datadir %(/usr/bin/pkg-config --variable=cups_datadir cups) +%_cups_serverroot %(/usr/bin/pkg-config --variable=cups_serverroot cups)