diff --git a/cups.spec b/cups.spec index f0595b56c71a3e6d758dc3ada7531a1732a744b9..8b1c19a233910045adba5a49e929cdcb1d4fa664 100644 --- a/cups.spec +++ b/cups.spec @@ -1,7 +1,7 @@ Name: cups Epoch: 1 Version: 2.2.13 -Release: 15 +Release: 16 Summary: CUPS is the standards-based, open source printing system for linux operating systems. License: GPLv2+ and LGPLv2+ with exceptions and AML Url: http://www.cups.org/ @@ -40,6 +40,7 @@ Patch6002: backport-CVE-2022-26691.patch Patch6003: CVE-2019-8842.patch Patch6004: backport-CVE-2023-32324.patch Patch6005: fix-httpAddrGetList-test-case-fail.patch +Patch6006: fix-verifying-that-history-still-exists-test-case-fail.patch Provides: cupsddk cupsddk-drivers cups-filesystem cups-client cups-ipptool cups-lpd Provides: lpd lpr /usr/bin/lpq /usr/bin/lpr /usr/bin/lp /usr/bin/cancel /usr/bin/lprm /usr/bin/lpstat @@ -334,6 +335,9 @@ rm -f %{_exec_prefix}/lib/cups/backend/smb %doc %{_datadir}/%{name}/www/apple-touch-icon.png %changelog +* Fri Jun 9 2023 zhangpan - 1:2.2.13-16 +- fix test case fail + * Fri Jun 9 2023 zhangpan - 1:2.2.13-15 - fix build error diff --git a/fix-verifying-that-history-still-exists-test-case-fail.patch b/fix-verifying-that-history-still-exists-test-case-fail.patch new file mode 100644 index 0000000000000000000000000000000000000000..a7d4f6ec6d7eef17daad535767c87dab0e331ca5 --- /dev/null +++ b/fix-verifying-that-history-still-exists-test-case-fail.patch @@ -0,0 +1,25 @@ +From 033bc4df3a58022b93e1cef8387b04d08dddd1fe Mon Sep 17 00:00:00 2001 +From: Michael R Sweet +Date: Sat, 28 Nov 2020 08:43:46 -0500 +Subject: [PATCH] Force a 5 second sleep to wait for the job control file to be + written. + +Reference:https://github.com/OpenPrinting/cups/commit/033bc4df3a58022b93e1cef8387b04d08dddd1fe +Conflict:NA + +--- + test/run-stp-tests.sh | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh +index d93388408a..4498a8c103 100755 +--- a/test/run-stp-tests.sh ++++ b/test/run-stp-tests.sh +@@ -845,6 +845,7 @@ else + echo "PASS" + echo " PASSED" >>$strfile + ++ sleep 5 + ./waitjobs.sh >>$strfile + + echo $ac_n "Verifying that history still exists: $ac_c"