diff --git a/cups.spec b/cups.spec index 93969fbed70eabc4ea016a5423cb363bb80ccb88..1e79d1654798d9184e5908cf1d1e07e470a1e5c5 100644 --- a/cups.spec +++ b/cups.spec @@ -3,7 +3,7 @@ Name: cups Epoch: 1 Version: 2.4.7 -Release: 1 +Release: 2 Summary: CUPS is the standards-based, open source printing system for linux operating systems. License: Apache-2.0 Url: https://openprinting.github.io/cups/ @@ -63,7 +63,7 @@ programs. Summary: CUPS printing system - development environment License: Apache-2.0 Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} -Requires: gnutls-devel krb5-devel zlib-devel +Requires: gnutls-devel krb5-devel zlib-devel pkgconf-pkg-config %description devel CUPS is the standards-based, open source printing system developed by Apple Inc. @@ -145,20 +145,20 @@ export CFLAGS="$RPM_OPT_FLAGS -fstack-protector-all -DLDAP_DEPRECATED=1" # --enable-debug to avoid stripping binaries %configure --with-docdir=%{_datadir}/%{name}/www --enable-debug \ --enable-lspp \ + --enable-webif \ + --enable-relro \ + --enable-page-logging \ + --enable-sync-on-close \ --with-exe-file-perm=0755 \ --with-cupsd-file-perm=0755 \ --with-log-file-perm=0600 \ - --enable-relro \ --with-dbusdir=%{_sysconfdir}/dbus-1 \ - --enable-avahi \ - --enable-threads \ - --enable-gnutls \ - --enable-webif \ --with-xinetd=no \ --with-access-log-level=actions \ - --enable-page-logging \ + --with-pkgconfpath=%{_libdir}/pkgconfig \ + --with-dnssd=avahi \ + --with-tls=gnutls \ --with-rundir=%{_rundir}/cups \ - --enable-sync-on-close \ localedir=%{_datadir}/locale %make_build @@ -403,8 +403,9 @@ rm -f %{_exec_prefix}/lib/cups/backend/smb %{_bindir}/cups-config %{_includedir}/cups %{_libdir}/*.so +%{_libdir}/pkgconfig/cups.pc %{_rpmconfigdir}/macros.d/macros.cups -%{_prefix}/lib/pkgconfig/cups.pc + %files lpd %{cups_serverbin}/daemon/cups-lpd @@ -446,6 +447,10 @@ rm -f %{_exec_prefix}/lib/cups/backend/smb %doc %{_datadir}/%{name}/www/apple-touch-icon.png %changelog +* Tue Mar 26 2024 zhaojunfei - 1:2.4.7-2 +- fix pkgconfig file generating +- eliminate deprecated configure parameters + * Fri Dec 29 2023 wangrui - 1:2.4.7-1 - update to 2.4.7 version diff --git a/cups.yaml b/cups.yaml index 5fbb53c410cd04df51708feac523338356557c8e..dfab6b33b5ff8cc39cadfaaf68f165a814537a9b 100644 --- a/cups.yaml +++ b/cups.yaml @@ -1,4 +1,4 @@ version_control: github -src_repo: apple/cups +src_repo: OpenPrinting/cups tag_prefix: ^v seperator: .