diff --git a/SPECS/xscreensaver.spec b/SPECS/xscreensaver.spec index 0504005..5d1fcaf 100644 --- a/SPECS/xscreensaver.spec +++ b/SPECS/xscreensaver.spec @@ -11,7 +11,7 @@ %define split_getimage 1 %endif -%define fedora_rel 1 +%define fedora_rel 2 %global use_clang_as_cc 0 %global use_clang_analyze 0 @@ -93,7 +93,8 @@ Patch1: xscreensaver-5.45-0001-barcode-glsnake-sanitize-the-names-of-mo ## Patches which must be discussed with upstream # See bug 472061 Patch21: xscreensaver-5.35-webcollage-default-nonet.patch -# +# watchdog_timer: don't relaunch hacks when unblanking +Patch101: xscreensaver-6.04-0001-watchdog_timer-don-t-relaunch-hacks-when-unblanking.patch # misc: kill gcc warn_unused_result warnings Patch3607: xscreensaver-5.36-0007-misc-kill-gcc-warn_unused_result-warnings.patch # Fedora specific @@ -375,6 +376,7 @@ find . -name \*.c -exec chmod ugo-x {} \; %__cat %PATCH1 | %__git am %__cat %PATCH21 | %__git am +%__cat %PATCH101 | %__git am #%%__cat %PATCH3607 | %__git am %__cat %PATCH10001 | %__git am @@ -1166,6 +1168,12 @@ exit 0 %endif %changelog +* Wed Aug 31 2022 Mamoru TASAKA - 1:6.04-2 +- watchdog_timer: don't relaunch hacks when unblanking + +* Sat Jul 23 2022 Fedora Release Engineering - 1:6.04-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon Jun 6 2022 Mamoru TASAKA - 1:6.04-1 - Update to 6.04