From 642608c5d955f3664257897af3fe7b81e11c7c2e Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Mon, 30 Aug 2021 23:05:17 +0200 Subject: [PATCH 01/21] Updated to 5.67 (#1837169) --- .gitignore | 1 + sources | 2 +- xlockmore.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4e1d9ab..a54b19b 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ xlockmore-5.28.tar.bz2 /xlockmore-5.63.tar.xz /xlockmore-5.64.tar.xz /xlockmore-5.66.tar.xz +/xlockmore-5.67.tar.xz diff --git a/sources b/sources index 766d273..8e6d083 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xlockmore-5.66.tar.xz) = d0a4665e23b32cc3370703e55396cd5c9659f836aa13a1737dd709632746cf9221acd66a529b9e05af981e5bef539e70582959b9d821854b93ef735ad1cd928d +SHA512 (xlockmore-5.67.tar.xz) = d32ae6c11c9e2389a563b91f970c93d0e67028ac6406038985a416404679aaf7d6e15551d1cf4387d71f851a90d2a02a0a328c0af57265c839edfe40dfffaa65 diff --git a/xlockmore.spec b/xlockmore.spec index e6575d1..4d0b1f9 100644 --- a/xlockmore.spec +++ b/xlockmore.spec @@ -1,7 +1,7 @@ Summary: Screen lock and screen saver Name: xlockmore -Version: 5.66 -Release: 3%{?dist} +Version: 5.67 +Release: 1%{?dist} License: BSD URL: http://sillycycle.com/xlockmore.html Source0: http://sillycycle.com/xlock/xlockmore-%{version}.tar.xz @@ -101,6 +101,9 @@ desktop-file-install \ %{_bindir}/xglock %changelog +* Mon Aug 30 2021 Adrian Reber - 5.67-1 +- Updated to 5.67 (#1837169) + * Fri Jul 23 2021 Fedora Release Engineering - 5.66-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 65337e75736775dff880dd13afdd110a690100c7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 05:12:40 +0000 Subject: [PATCH 02/21] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xlockmore.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xlockmore.spec b/xlockmore.spec index 4d0b1f9..184e1f8 100644 --- a/xlockmore.spec +++ b/xlockmore.spec @@ -1,7 +1,7 @@ Summary: Screen lock and screen saver Name: xlockmore Version: 5.67 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD URL: http://sillycycle.com/xlockmore.html Source0: http://sillycycle.com/xlock/xlockmore-%{version}.tar.xz @@ -101,6 +101,9 @@ desktop-file-install \ %{_bindir}/xglock %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 5.67-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Mon Aug 30 2021 Adrian Reber - 5.67-1 - Updated to 5.67 (#1837169) From a62de641b29d5c19d119f12b6ba3666040a04911 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Wed, 13 Jul 2022 17:53:20 +0200 Subject: [PATCH 03/21] Updated to 5.70 (#1837169) Signed-off-by: Adrian Reber --- .gitignore | 1 + sources | 2 +- xlockmore.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a54b19b..94ce706 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ xlockmore-5.28.tar.bz2 /xlockmore-5.64.tar.xz /xlockmore-5.66.tar.xz /xlockmore-5.67.tar.xz +/xlockmore-5.70.tar.xz diff --git a/sources b/sources index 8e6d083..2f42857 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xlockmore-5.67.tar.xz) = d32ae6c11c9e2389a563b91f970c93d0e67028ac6406038985a416404679aaf7d6e15551d1cf4387d71f851a90d2a02a0a328c0af57265c839edfe40dfffaa65 +SHA512 (xlockmore-5.70.tar.xz) = 4409f3f49e68c6aa630391db62dc80c79dba777f0fbe311d7d6dcf01f3df6b3d041bc44376258cadca15e12b0bb0846adc5fe5ae0aaf87cec190bc09721b8464 diff --git a/xlockmore.spec b/xlockmore.spec index 184e1f8..e390ca5 100644 --- a/xlockmore.spec +++ b/xlockmore.spec @@ -1,7 +1,7 @@ Summary: Screen lock and screen saver Name: xlockmore -Version: 5.67 -Release: 2%{?dist} +Version: 5.70 +Release: 1%{?dist} License: BSD URL: http://sillycycle.com/xlockmore.html Source0: http://sillycycle.com/xlock/xlockmore-%{version}.tar.xz @@ -101,6 +101,9 @@ desktop-file-install \ %{_bindir}/xglock %changelog +* Wed Jul 13 2022 Adrian Reber - 5.70-1 +- Updated to 5.70 (#1837169) + * Sat Jan 22 2022 Fedora Release Engineering - 5.67-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From eadf114ce7ba90a27cbb4991d3220c49276e0cf3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 13:14:30 +0000 Subject: [PATCH 04/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xlockmore.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xlockmore.spec b/xlockmore.spec index e390ca5..fb5d821 100644 --- a/xlockmore.spec +++ b/xlockmore.spec @@ -1,7 +1,7 @@ Summary: Screen lock and screen saver Name: xlockmore Version: 5.70 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD URL: http://sillycycle.com/xlockmore.html Source0: http://sillycycle.com/xlock/xlockmore-%{version}.tar.xz @@ -101,6 +101,9 @@ desktop-file-install \ %{_bindir}/xglock %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 5.70-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jul 13 2022 Adrian Reber - 5.70-1 - Updated to 5.70 (#1837169) From e02f011c6a37757426c1e07383fb11447db8e523 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 07:34:35 +0000 Subject: [PATCH 05/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xlockmore.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xlockmore.spec b/xlockmore.spec index fb5d821..af87242 100644 --- a/xlockmore.spec +++ b/xlockmore.spec @@ -1,7 +1,7 @@ Summary: Screen lock and screen saver Name: xlockmore Version: 5.70 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD URL: http://sillycycle.com/xlockmore.html Source0: http://sillycycle.com/xlock/xlockmore-%{version}.tar.xz @@ -101,6 +101,9 @@ desktop-file-install \ %{_bindir}/xglock %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 5.70-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 5.70-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 1158eed0caf8774abe0041a35867aaa70a5776bd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 18:58:21 +0000 Subject: [PATCH 06/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xlockmore.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xlockmore.spec b/xlockmore.spec index af87242..b472329 100644 --- a/xlockmore.spec +++ b/xlockmore.spec @@ -1,7 +1,7 @@ Summary: Screen lock and screen saver Name: xlockmore Version: 5.70 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD URL: http://sillycycle.com/xlockmore.html Source0: http://sillycycle.com/xlock/xlockmore-%{version}.tar.xz @@ -101,6 +101,9 @@ desktop-file-install \ %{_bindir}/xglock %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 5.70-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 5.70-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From a65d2cbb59f2c67c94b8e22ff32d134a6c1f0168 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Tue, 12 Dec 2023 11:00:27 +0100 Subject: [PATCH 07/21] Updated to 5.74 (#1837169) Signed-off-by: Adrian Reber --- .gitignore | 1 + sources | 2 +- xlockmore.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 94ce706..de415e3 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ xlockmore-5.28.tar.bz2 /xlockmore-5.66.tar.xz /xlockmore-5.67.tar.xz /xlockmore-5.70.tar.xz +/xlockmore-5.74.tar.xz diff --git a/sources b/sources index 2f42857..181c729 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xlockmore-5.70.tar.xz) = 4409f3f49e68c6aa630391db62dc80c79dba777f0fbe311d7d6dcf01f3df6b3d041bc44376258cadca15e12b0bb0846adc5fe5ae0aaf87cec190bc09721b8464 +SHA512 (xlockmore-5.74.tar.xz) = 041d49c835281cdd0c8c92712a38595504658934729bef9604a607a3cd1ac0b243373978c0eb9ac550b73ec9da8ee1425131e835e9a4b6643881b5e163645d30 diff --git a/xlockmore.spec b/xlockmore.spec index b472329..cc53cbd 100644 --- a/xlockmore.spec +++ b/xlockmore.spec @@ -1,7 +1,7 @@ Summary: Screen lock and screen saver Name: xlockmore -Version: 5.70 -Release: 4%{?dist} +Version: 5.74 +Release: 1%{?dist} License: BSD URL: http://sillycycle.com/xlockmore.html Source0: http://sillycycle.com/xlock/xlockmore-%{version}.tar.xz @@ -101,6 +101,9 @@ desktop-file-install \ %{_bindir}/xglock %changelog +* Tue Dec 12 2023 Adrian Reber - 5.74-1 +- Updated to 5.74 (#1837169) + * Sat Jul 22 2023 Fedora Release Engineering - 5.70-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From ed647c8cf0cc9f5e6539ed7e661a6fc2919dca55 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 09:49:30 +0000 Subject: [PATCH 08/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- xlockmore.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xlockmore.spec b/xlockmore.spec index cc53cbd..ba19201 100644 --- a/xlockmore.spec +++ b/xlockmore.spec @@ -1,7 +1,7 @@ Summary: Screen lock and screen saver Name: xlockmore Version: 5.74 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD URL: http://sillycycle.com/xlockmore.html Source0: http://sillycycle.com/xlock/xlockmore-%{version}.tar.xz @@ -101,6 +101,9 @@ desktop-file-install \ %{_bindir}/xglock %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 5.74-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Tue Dec 12 2023 Adrian Reber - 5.74-1 - Updated to 5.74 (#1837169) From 39279639975f6236fad5d1cfbb2a98a37da3e02a Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Thu, 2 May 2024 08:17:03 +0200 Subject: [PATCH 09/21] Updated to 5.77 (#1837169) Signed-off-by: Adrian Reber --- .gitignore | 1 + sources | 2 +- xlockmore.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index de415e3..b8ebbbe 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ xlockmore-5.28.tar.bz2 /xlockmore-5.67.tar.xz /xlockmore-5.70.tar.xz /xlockmore-5.74.tar.xz +/xlockmore-5.77.tar.xz diff --git a/sources b/sources index 181c729..320b46f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xlockmore-5.74.tar.xz) = 041d49c835281cdd0c8c92712a38595504658934729bef9604a607a3cd1ac0b243373978c0eb9ac550b73ec9da8ee1425131e835e9a4b6643881b5e163645d30 +SHA512 (xlockmore-5.77.tar.xz) = 468d03f829c2b169295b33b3b3fd3747249fbe6306d99bd731e4f117d0c79e8edda8b871cbc06aba7a718578b56301bd358d756d786294e53bd333e57925cb87 diff --git a/xlockmore.spec b/xlockmore.spec index ba19201..59ff707 100644 --- a/xlockmore.spec +++ b/xlockmore.spec @@ -1,7 +1,7 @@ Summary: Screen lock and screen saver Name: xlockmore -Version: 5.74 -Release: 2%{?dist} +Version: 5.77 +Release: 1%{?dist} License: BSD URL: http://sillycycle.com/xlockmore.html Source0: http://sillycycle.com/xlock/xlockmore-%{version}.tar.xz @@ -101,6 +101,9 @@ desktop-file-install \ %{_bindir}/xglock %changelog +* Thu May 02 2024 Adrian Reber - 5.77-1 +- Updated to 5.77 (#1837169) + * Sat Jan 27 2024 Fedora Release Engineering - 5.74-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From fa2eb225671366bb5c6c9502a2f3f0b279131e25 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:10:27 +0000 Subject: [PATCH 10/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- xlockmore.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xlockmore.spec b/xlockmore.spec index 59ff707..5510dbe 100644 --- a/xlockmore.spec +++ b/xlockmore.spec @@ -1,7 +1,7 @@ Summary: Screen lock and screen saver Name: xlockmore Version: 5.77 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD URL: http://sillycycle.com/xlockmore.html Source0: http://sillycycle.com/xlock/xlockmore-%{version}.tar.xz @@ -101,6 +101,9 @@ desktop-file-install \ %{_bindir}/xglock %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 5.77-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Thu May 02 2024 Adrian Reber - 5.77-1 - Updated to 5.77 (#1837169) From d003f917bbc92e31550480823b33669fc7b69680 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 4 Sep 2024 22:56:17 +0200 Subject: [PATCH 11/21] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- xlockmore.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xlockmore.spec b/xlockmore.spec index 5510dbe..f0198a7 100644 --- a/xlockmore.spec +++ b/xlockmore.spec @@ -1,8 +1,9 @@ Summary: Screen lock and screen saver Name: xlockmore Version: 5.77 -Release: 2%{?dist} -License: BSD +Release: 3%{?dist} +# Automatically converted from old format: BSD - review is highly recommended. +License: LicenseRef-Callaway-BSD URL: http://sillycycle.com/xlockmore.html Source0: http://sillycycle.com/xlock/xlockmore-%{version}.tar.xz BuildRequires: make @@ -101,6 +102,9 @@ desktop-file-install \ %{_bindir}/xglock %changelog +* Wed Sep 04 2024 Miroslav Suchý - 5.77-3 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 5.77-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From d619bac09d907b97011690c778c62c2688aa7a65 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 15:57:33 +0000 Subject: [PATCH 12/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- xlockmore.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xlockmore.spec b/xlockmore.spec index f0198a7..30fa96d 100644 --- a/xlockmore.spec +++ b/xlockmore.spec @@ -1,7 +1,7 @@ Summary: Screen lock and screen saver Name: xlockmore Version: 5.77 -Release: 3%{?dist} +Release: 4%{?dist} # Automatically converted from old format: BSD - review is highly recommended. License: LicenseRef-Callaway-BSD URL: http://sillycycle.com/xlockmore.html @@ -102,6 +102,9 @@ desktop-file-install \ %{_bindir}/xglock %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 5.77-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Sep 04 2024 Miroslav Suchý - 5.77-3 - convert license to SPDX From 7fc0386a3b3078c9ca3b19c1b9827026cb7f881a Mon Sep 17 00:00:00 2001 From: Martin Cermak Date: Tue, 18 Feb 2025 18:33:48 +0100 Subject: [PATCH 13/21] Updated for FTBFS (#2341574) --- xlockmore.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/xlockmore.spec b/xlockmore.spec index 30fa96d..c8a0fe5 100644 --- a/xlockmore.spec +++ b/xlockmore.spec @@ -1,7 +1,7 @@ Summary: Screen lock and screen saver Name: xlockmore Version: 5.77 -Release: 4%{?dist} +Release: 5%{?dist} # Automatically converted from old format: BSD - review is highly recommended. License: LicenseRef-Callaway-BSD URL: http://sillycycle.com/xlockmore.html @@ -43,6 +43,10 @@ GTK based frontend for xlockmore. %build %configure --with-crypt --enable-pam --enable-syslog --disable-setuid --disable-mb + +# Work around BZ#2341574 +sed -i 's/^CC =.*/\0 -std=c17/' xglock/Makefile + %{__make} %{?_smp_mflags} %install @@ -102,6 +106,9 @@ desktop-file-install \ %{_bindir}/xglock %changelog +* Tue Feb 18 2025 Martin Cermak - 5.77-5 +- Updated for FTBFS (#2341574) + * Sun Jan 19 2025 Fedora Release Engineering - 5.77-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From be8942c43cbaa06e97d2ff7545ff037654e3c1c0 Mon Sep 17 00:00:00 2001 From: Martin Cermak Date: Wed, 19 Feb 2025 10:50:42 +0100 Subject: [PATCH 14/21] Rebase to upstream version 5.81. --- .gitignore | 1 + sources | 2 +- xlockmore.spec | 15 +++++++++++++-- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b8ebbbe..47d1d97 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ xlockmore-5.28.tar.bz2 /xlockmore-5.70.tar.xz /xlockmore-5.74.tar.xz /xlockmore-5.77.tar.xz +/xlockmore-5.81.tar.xz diff --git a/sources b/sources index 320b46f..3249fd8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xlockmore-5.77.tar.xz) = 468d03f829c2b169295b33b3b3fd3747249fbe6306d99bd731e4f117d0c79e8edda8b871cbc06aba7a718578b56301bd358d756d786294e53bd333e57925cb87 +SHA512 (xlockmore-5.81.tar.xz) = 5eb21c89295bbdad5d157a57bffa69018deb1bd7ac7af3d258e6aa658bd372afacecba47918912860b72267298f075bde09118f245ca45cddf774d9c7e15d376 diff --git a/xlockmore.spec b/xlockmore.spec index c8a0fe5..d6c3135 100644 --- a/xlockmore.spec +++ b/xlockmore.spec @@ -1,7 +1,7 @@ Summary: Screen lock and screen saver Name: xlockmore -Version: 5.77 -Release: 5%{?dist} +Version: 5.81 +Release: 1%{?dist} # Automatically converted from old format: BSD - review is highly recommended. License: LicenseRef-Callaway-BSD URL: http://sillycycle.com/xlockmore.html @@ -41,12 +41,20 @@ GTK based frontend for xlockmore. %{__sed} -i -e "s,/lib,/%{_lib},g;s,-Wno-format,,g;" configure +# See README for X(M)LOCKLDFLAGS explanation +%{__sed} -i "/^XLOCKLDFLAGS$/d" configure +%{__sed} -i "/^XMLOCKLDFLAGS$/d" configure + %build %configure --with-crypt --enable-pam --enable-syslog --disable-setuid --disable-mb # Work around BZ#2341574 sed -i 's/^CC =.*/\0 -std=c17/' xglock/Makefile +# See README for X(M)LOCKLDFLAGS explanation +sed -i 's/@XLOCKLDFLAGS@//' modes/Makefile +sed -i 's/@XMLOCKLDFLAGS@//' xmlock/Makefile + %{__make} %{?_smp_mflags} %install @@ -106,6 +114,9 @@ desktop-file-install \ %{_bindir}/xglock %changelog +* Wed Feb 19 2025 Martin Cermak - 5.81-1 +- Updated to 5.81 (#1837169) + * Tue Feb 18 2025 Martin Cermak - 5.77-5 - Updated for FTBFS (#2341574) From 8223e008cdf4356eb5cd64d1b923eaf447c60c88 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:54:13 +0000 Subject: [PATCH 15/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- xlockmore.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xlockmore.spec b/xlockmore.spec index d6c3135..be0045d 100644 --- a/xlockmore.spec +++ b/xlockmore.spec @@ -1,7 +1,7 @@ Summary: Screen lock and screen saver Name: xlockmore Version: 5.81 -Release: 1%{?dist} +Release: 2%{?dist} # Automatically converted from old format: BSD - review is highly recommended. License: LicenseRef-Callaway-BSD URL: http://sillycycle.com/xlockmore.html @@ -114,6 +114,9 @@ desktop-file-install \ %{_bindir}/xglock %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 5.81-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Wed Feb 19 2025 Martin Cermak - 5.81-1 - Updated to 5.81 (#1837169) From edec5c69daa585285a6fca6ec288a17a3157b784 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Mon, 15 Dec 2025 10:44:42 +0100 Subject: [PATCH 16/21] Updated to 5.86 (#2361972) Signed-off-by: Adrian Reber --- .gitignore | 1 + sources | 2 +- xlockmore.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 47d1d97..f35785c 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ xlockmore-5.28.tar.bz2 /xlockmore-5.74.tar.xz /xlockmore-5.77.tar.xz /xlockmore-5.81.tar.xz +/xlockmore-5.86.tar.xz diff --git a/sources b/sources index 3249fd8..2ebd41b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xlockmore-5.81.tar.xz) = 5eb21c89295bbdad5d157a57bffa69018deb1bd7ac7af3d258e6aa658bd372afacecba47918912860b72267298f075bde09118f245ca45cddf774d9c7e15d376 +SHA512 (xlockmore-5.86.tar.xz) = 4c5e9ee979cbc3c9e3d2eb86126040d037f82e05ec29ce43de0f4f55691101d6d8d4662a571b1248d2b6a64a2fc4851e0ae64dc106ed621b7aff5b08bfe25a0a diff --git a/xlockmore.spec b/xlockmore.spec index be0045d..1c71d14 100644 --- a/xlockmore.spec +++ b/xlockmore.spec @@ -1,7 +1,7 @@ Summary: Screen lock and screen saver Name: xlockmore -Version: 5.81 -Release: 2%{?dist} +Version: 5.86 +Release: 1%{?dist} # Automatically converted from old format: BSD - review is highly recommended. License: LicenseRef-Callaway-BSD URL: http://sillycycle.com/xlockmore.html @@ -114,6 +114,9 @@ desktop-file-install \ %{_bindir}/xglock %changelog +* Mon Dec 15 2025 Adrian Reber - 5.86-1 +- Updated to 5.86 (#2361972) + * Fri Jul 25 2025 Fedora Release Engineering - 5.81-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 8e86917c3e9fce6a5c4d979620e07fa1e45c9ddb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:43:51 +0000 Subject: [PATCH 17/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- xlockmore.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xlockmore.spec b/xlockmore.spec index 1c71d14..aaab4b7 100644 --- a/xlockmore.spec +++ b/xlockmore.spec @@ -1,7 +1,7 @@ Summary: Screen lock and screen saver Name: xlockmore Version: 5.86 -Release: 1%{?dist} +Release: 2%{?dist} # Automatically converted from old format: BSD - review is highly recommended. License: LicenseRef-Callaway-BSD URL: http://sillycycle.com/xlockmore.html @@ -114,6 +114,9 @@ desktop-file-install \ %{_bindir}/xglock %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 5.86-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Mon Dec 15 2025 Adrian Reber - 5.86-1 - Updated to 5.86 (#2361972) From 938f4aef4525fa4885d130eec58e9e925d737eed Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Wed, 4 Feb 2026 15:07:13 +0100 Subject: [PATCH 18/21] Updated to 5.87 Signed-off-by: Adrian Reber --- xlockmore-ignore-void.patch | 56 +++++++++++++++++++++++++++++++++++++ xlockmore.spec | 9 ++++-- 2 files changed, 63 insertions(+), 2 deletions(-) create mode 100644 xlockmore-ignore-void.patch diff --git a/xlockmore-ignore-void.patch b/xlockmore-ignore-void.patch new file mode 100644 index 0000000..5705837 --- /dev/null +++ b/xlockmore-ignore-void.patch @@ -0,0 +1,56 @@ +--- a/xglock/xglock.c.orig 2026-02-04 14:55:58.908881606 +0100 ++++ b/xglock/xglock.c 2026-02-04 14:56:41.293020943 +0100 +@@ -714,7 +714,7 @@ + struct_option_fntcol_callback *cbs_ptr =(struct_option_fntcol_callback *)udata; + gtk_widget_hide(cbs_ptr->fntcol_dialog); + gtk_widget_destroy(cbs_ptr->fntcol_dialog); +- (void) g_free(udata); ++ g_free(udata); + } + + /* +@@ -777,7 +777,7 @@ + gtk_entry_set_text( GTK_ENTRY(cbs_ptr->entry), colorstr ); + gtk_widget_hide( cbs_ptr->fntcol_dialog ); + gtk_widget_destroy(cbs_ptr->fntcol_dialog); +- (void) g_free(udata); ++ g_free(udata); + } + + /* +@@ -910,7 +910,7 @@ + struct_option_fntcol_callback *cbs_ptr = (struct_option_fntcol_callback *)udata; + gtk_widget_hide(cbs_ptr->fntcol_dialog); + gtk_widget_destroy(cbs_ptr->fntcol_dialog); +- (void) g_free(udata); ++ g_free(udata); + } + + /* +@@ -927,7 +927,7 @@ + gtk_entry_set_text(GTK_ENTRY(cbs_ptr->entry), + gtk_font_selection_dialog_get_font_name(GTK_FONT_SELECTION_DIALOG(cbs_ptr->fntcol_dialog))); + gtk_widget_destroy(cbs_ptr->fntcol_dialog); +- (void) g_free(udata); ++ g_free(udata); + } + + /* +@@ -979,7 +979,7 @@ + struct_option_fntcol_callback *cbs_ptr= (struct_option_fntcol_callback *)udata; + gtk_widget_hide( cbs_ptr->fntcol_dialog ); + gtk_widget_destroy( cbs_ptr->fntcol_dialog ); +- (void) g_free(udata); ++ g_free(udata); + } + + /* +@@ -1002,7 +1002,7 @@ + gtk_widget_hide(cbs_ptr->fntcol_dialog); + gtk_entry_set_text(GTK_ENTRY(cbs_ptr->entry), filename); + gtk_widget_destroy(cbs_ptr->fntcol_dialog); +- (void) g_free(udata); ++ g_free(udata); + } + } + diff --git a/xlockmore.spec b/xlockmore.spec index aaab4b7..ebb8e89 100644 --- a/xlockmore.spec +++ b/xlockmore.spec @@ -1,7 +1,7 @@ Summary: Screen lock and screen saver Name: xlockmore -Version: 5.86 -Release: 2%{?dist} +Version: 5.87 +Release: 1%{?dist} # Automatically converted from old format: BSD - review is highly recommended. License: LicenseRef-Callaway-BSD URL: http://sillycycle.com/xlockmore.html @@ -13,6 +13,7 @@ BuildRequires: mesa-libGL-devel mesa-libGLU-devel BuildRequires: desktop-file-utils libXdmcp-devel BuildRequires: motif-devel gtk2-devel BuildRequires: libXau-devel +Patch0: xlockmore-ignore-void.patch %if 0%{?rhel} Requires: gnome-icon-theme %else @@ -38,6 +39,7 @@ GTK based frontend for xlockmore. %prep %setup -q +%patch -P 0 -p 1 %{__sed} -i -e "s,/lib,/%{_lib},g;s,-Wno-format,,g;" configure @@ -114,6 +116,9 @@ desktop-file-install \ %{_bindir}/xglock %changelog +* Wed Feb 04 2026 Adrian Reber - 5.87-1 +- Updated to 5.87 (#2435197) + * Sat Jan 17 2026 Fedora Release Engineering - 5.86-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 6e706ea27ae8559a750a25389ab1cc18178d5f39 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Wed, 4 Feb 2026 15:20:05 +0100 Subject: [PATCH 19/21] Forgot to upload the sources Signed-off-by: Adrian Reber --- .gitignore | 1 + sources | 2 +- xlockmore.spec | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f35785c..a1e7ec4 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ xlockmore-5.28.tar.bz2 /xlockmore-5.77.tar.xz /xlockmore-5.81.tar.xz /xlockmore-5.86.tar.xz +/xlockmore-5.87.tar.xz diff --git a/sources b/sources index 2ebd41b..a977573 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xlockmore-5.86.tar.xz) = 4c5e9ee979cbc3c9e3d2eb86126040d037f82e05ec29ce43de0f4f55691101d6d8d4662a571b1248d2b6a64a2fc4851e0ae64dc106ed621b7aff5b08bfe25a0a +SHA512 (xlockmore-5.87.tar.xz) = 2a61e77585723f7a7232bed02baa447c4a46c02ab98ced26e6ca989fb2b7b625b7d6b631fa3ef5419b8126bd45f997d93ee116ef0e3cc65297edea2aadbdb9ae diff --git a/xlockmore.spec b/xlockmore.spec index ebb8e89..0845df4 100644 --- a/xlockmore.spec +++ b/xlockmore.spec @@ -1,7 +1,7 @@ Summary: Screen lock and screen saver Name: xlockmore Version: 5.87 -Release: 1%{?dist} +Release: 2%{?dist} # Automatically converted from old format: BSD - review is highly recommended. License: LicenseRef-Callaway-BSD URL: http://sillycycle.com/xlockmore.html @@ -116,7 +116,7 @@ desktop-file-install \ %{_bindir}/xglock %changelog -* Wed Feb 04 2026 Adrian Reber - 5.87-1 +* Wed Feb 04 2026 Adrian Reber - 5.87-2 - Updated to 5.87 (#2435197) * Sat Jan 17 2026 Fedora Release Engineering - 5.86-2 From 0fd6dc1960a38af50f740a3ce5878714da03c8aa Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Mon, 9 Feb 2026 12:31:02 +0100 Subject: [PATCH 20/21] Updated to 5.88 (#2425617) Signed-off-by: Adrian Reber --- .gitignore | 1 + sources | 2 +- xlockmore.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a1e7ec4..aed7e79 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ xlockmore-5.28.tar.bz2 /xlockmore-5.81.tar.xz /xlockmore-5.86.tar.xz /xlockmore-5.87.tar.xz +/xlockmore-5.88.tar.xz diff --git a/sources b/sources index a977573..73fe2eb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xlockmore-5.87.tar.xz) = 2a61e77585723f7a7232bed02baa447c4a46c02ab98ced26e6ca989fb2b7b625b7d6b631fa3ef5419b8126bd45f997d93ee116ef0e3cc65297edea2aadbdb9ae +SHA512 (xlockmore-5.88.tar.xz) = 88bd987c6f1e1f03e8b9de11588a00d20c399cbf83858a5ff5b3573251bb0afa135a357661483f277b187e41a8d3255379f04ad8f351d610dacc13325a3943a3 diff --git a/xlockmore.spec b/xlockmore.spec index 0845df4..d723045 100644 --- a/xlockmore.spec +++ b/xlockmore.spec @@ -1,7 +1,7 @@ Summary: Screen lock and screen saver Name: xlockmore -Version: 5.87 -Release: 2%{?dist} +Version: 5.88 +Release: 1%{?dist} # Automatically converted from old format: BSD - review is highly recommended. License: LicenseRef-Callaway-BSD URL: http://sillycycle.com/xlockmore.html @@ -116,6 +116,9 @@ desktop-file-install \ %{_bindir}/xglock %changelog +* Mon Feb 09 2026 Adrian Reber - 5.88-1 +- Updated to 5.88 (#2425617) + * Wed Feb 04 2026 Adrian Reber - 5.87-2 - Updated to 5.87 (#2435197) From 5b2f604c1d0fb34cb494d0980d40f4cad16ddc51 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:16:42 +0000 Subject: [PATCH 21/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- xlockmore.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xlockmore.spec b/xlockmore.spec index d723045..878b3aa 100644 --- a/xlockmore.spec +++ b/xlockmore.spec @@ -1,7 +1,7 @@ Summary: Screen lock and screen saver Name: xlockmore Version: 5.88 -Release: 1%{?dist} +Release: 2%{?dist} # Automatically converted from old format: BSD - review is highly recommended. License: LicenseRef-Callaway-BSD URL: http://sillycycle.com/xlockmore.html @@ -116,6 +116,9 @@ desktop-file-install \ %{_bindir}/xglock %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 5.88-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Mon Feb 09 2026 Adrian Reber - 5.88-1 - Updated to 5.88 (#2425617)