diff --git a/cups.spec b/cups.spec index 344645f..595980e 100644 --- a/cups.spec +++ b/cups.spec @@ -22,7 +22,7 @@ Summary: CUPS printing system Name: cups Epoch: 1 Version: 2.4.7 -Release: 10%{?dist} +Release: 11%{?dist} # backend/failover.c - BSD-3-Clause # cups/md5* - Zlib # scheduler/colorman.c - Apache-2.0 WITH LLVM-exception AND BSD-2-Clause @@ -135,10 +135,10 @@ BuildRequires: audit-libs-devel # /etc/cups was moved from main package to filesystem package # remove once CentOS Stream 10 is released -Conflicts: %{name}-filesystem < 2.4.2-9 +Conflicts: %{name}-filesystem < 1:2.4.2-9 # ippfind manpage was moved to cups-ipptool # remove once C10S is released -Conflicts: %{name}-ipptool < 2.4.3-1 +Conflicts: %{name}-ipptool < 1:2.4.3-1 # getaddrinfo from glibc needs nss-mdns or systemd-resolved for resolving # mdns .local addresses. Don't require a specific package for now and let @@ -214,7 +214,7 @@ Summary: CUPS printing system - directory layout BuildArch: noarch # /etc/cups was moved from main package to filesystem package # remove once CentOS Stream 10 is released -Conflicts: %{name} < 2.4.2-9 +Conflicts: %{name} < 1:2.4.2-9 %package lpd @@ -227,7 +227,7 @@ Provides: lpd Summary: CUPS printing system - tool for performing IPP requests # ippfind manpage was moved to cups-ipptool # remove once C10S is released -Conflicts: %{name} < 2.4.3-1 +Conflicts: %{name} < 1:2.4.3-1 Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} # ippfind needs avahi for printer discovery Requires: avahi @@ -812,6 +812,9 @@ rm -f %{cups_serverbin}/backend/smb %{_mandir}/man7/ippeveps.7.gz %changelog +* Tue Apr 16 2024 Zdenek Dohnal - 1:2.4.7-11 +- add epochs into conflicts + * Fri Apr 05 2024 Zdenek Dohnal - 1:2.4.7-10 - RHEL-31887 cups doesn't send Content-Type header back to client when Set-Cookie is seen first