rpms/cups
6
0
Fork 0
Code Issues Pull Requests Releases Activity

add epochs into conflicts

Browse Source 
Resolves: RHEL-26061
This commit is contained in:
Zdenek Dohnal 2024-02-19 13:05:42 +01:00
parent f41b6860c8
commit 05e25bd50d
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cups.spec
View File

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