From 31cdcfd8237d9a127cddca9d5701c4103fd0c80a Mon Sep 17 00:00:00 2001 From: zhouwenpei Date: Tue, 21 Feb 2023 07:01:55 +0000 Subject: [PATCH] fix update conflict of devel and help (cherry picked from commit 02e84740176457bb97abd52007095d098119b8f9) --- cups.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cups.spec b/cups.spec index 3b12eba0..ddb04954 100644 --- a/cups.spec +++ b/cups.spec @@ -3,7 +3,7 @@ Name: cups Epoch: 1 Version: 2.4.0 -Release: 4 +Release: 5 Summary: CUPS is the standards-based, open source printing system for linux operating systems. License: GPLv2+ and LGPLv2+ with exceptions and AML Url: https://openprinting.github.io/cups/ @@ -405,7 +405,6 @@ rm -f %{_exec_prefix}/lib/cups/backend/smb %{_bindir}/cups-config %{_includedir}/cups %{_libdir}/*.so -%{_mandir}/man1/cups-config.1.gz %{_rpmconfigdir}/macros.d/macros.cups %{_prefix}/lib/pkgconfig/cups.pc @@ -434,6 +433,7 @@ rm -f %{_exec_prefix}/lib/cups/backend/smb %files help %{_mandir}/man[1578]/* +%{_mandir}/man1/cups-config.1.gz %doc README.md CREDITS.md CHANGES.md %doc %{_datadir}/%{name}/www/index.html %doc %{_datadir}/%{name}/www/help @@ -448,6 +448,9 @@ rm -f %{_exec_prefix}/lib/cups/backend/smb %doc %{_datadir}/%{name}/www/apple-touch-icon.png %changelog +* Tue Feb 21 2023 zhouwenpei - 2.4.0-5 +- fix update conflict of devel and help + * Wed Jun 15 2022 hanhui - 2.4.0-4 - Remove legacy code for RIP_MAX_CACHE environment variable