diff --git a/cups.spec b/cups.spec index 8e183bf..c1e1fad 100644 --- a/cups.spec +++ b/cups.spec @@ -22,7 +22,7 @@ Summary: CUPS printing system Name: cups Epoch: 1 Version: 2.4.10 -Release: 6%{?dist} +Release: 7%{?dist} # backend/failover.c - BSD-3-Clause # cups/md5* - Zlib # scheduler/colorman.c - Apache-2.0 WITH LLVM-exception AND BSD-2-Clause @@ -125,9 +125,9 @@ BuildRequires: libselinux-devel BuildRequires: audit-libs-devel %endif -# /etc/cups was moved from main package to filesystem package +# /etc/cups/ssl and /etc/cups were moved from main package to filesystem package # remove once CentOS Stream 10 is released -Conflicts: %{name}-filesystem < 1:2.4.2-9 +Conflicts: %{name}-filesystem < 1:2.4.10-7 # ippfind manpage was moved to cups-ipptool # remove once C10S is released Conflicts: %{name}-ipptool < 1:2.4.3-1 @@ -197,13 +197,14 @@ Requires: zlib-devel %package libs Summary: CUPS printing system - libraries +Requires: %{name}-filesystem = %{epoch}:%{version}-%{release} %package filesystem Summary: CUPS printing system - directory layout BuildArch: noarch -# /etc/cups was moved from main package to filesystem package +# /etc/cups/ssl and /etc/cups were moved from main package to filesystem package # remove once CentOS Stream 10 is released -Conflicts: %{name} < 1:2.4.2-9 +Conflicts: %{name} < 1:2.4.10-7 %package lpd @@ -760,6 +761,7 @@ rm -f %{cups_serverbin}/backend/smb %dir %{_datadir}/cups/ppdc %dir %{_datadir}/ppd %dir %attr(0755,root,lp) %{_sysconfdir}/cups +%dir %attr(0700,root,lp) %{_sysconfdir}/cups/ssl %files devel %{_bindir}/cups-config @@ -794,6 +796,9 @@ rm -f %{cups_serverbin}/backend/smb %{_mandir}/man7/ippeveps.7.gz %changelog +* Thu Nov 14 2024 Zdenek Dohnal - 1:2.4.10-7 +- RHEL-67580 Move /etc/cups/ssl into cups-filesystem and require filesystem in libs + * Tue Oct 29 2024 Troy Dawson - 1:2.4.10-6 - Bump release for October 2024 mass rebuild: Resolves: RHEL-64018