From 52eba8e73a02113d656a52da28deed856892f5f9 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Fri, 25 Nov 2022 12:12:20 +0100 Subject: [PATCH 01/12] Port configure scripts to C99 There is probably no need to upstream this because these code fragments come from historic autoconf, and a potential future upstream release would use a newer version. Related to: --- xdaliclock-configure-c99.patch | 26 ++++++++++++++++++++++++++ xdaliclock.spec | 8 ++++++-- 2 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 xdaliclock-configure-c99.patch diff --git a/xdaliclock-configure-c99.patch b/xdaliclock-configure-c99.patch new file mode 100644 index 0000000..a0bfd73 --- /dev/null +++ b/xdaliclock-configure-c99.patch @@ -0,0 +1,26 @@ +diff --git a/X11/configure b/X11/configure +index 8a623269ddc8971c..cc143bbbedea14e4 100755 +--- a/X11/configure ++++ b/X11/configure +@@ -2943,7 +2943,7 @@ _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +- main(int ac, char **av) { return 0; } ++ int main(int ac, char **av) { return 0; } + _ACEOF + rm -f conftest$ac_exeext + if { (ac_try="$ac_link" +diff --git a/gtk/configure b/gtk/configure +index 4812b87d4eb04e50..9445f0dc2f577cc5 100755 +--- a/gtk/configure ++++ b/gtk/configure +@@ -3006,7 +3006,7 @@ _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +- main(int ac, char **av) { return 0; } ++ int main(int ac, char **av) { return 0; } + _ACEOF + rm -f conftest$ac_exeext + if { (ac_try="$ac_link" diff --git a/xdaliclock.spec b/xdaliclock.spec index 6798b6d..df61492 100644 --- a/xdaliclock.spec +++ b/xdaliclock.spec @@ -1,11 +1,12 @@ Summary: A clock for the X Window System Name: xdaliclock Version: 2.43 -Release: 15%{?dist} +Release: 16%{?dist} License: BSD URL: http://www.jwz.org/xdaliclock/ Source0: http://www.jwz.org/xdaliclock/xdaliclock-%{version}.tar.gz Source1: xdaliclock.desktop +Patch0: xdaliclock-configure-c99.patch BuildRequires: make BuildRequires: gcc BuildRequires: desktop-file-utils @@ -21,7 +22,7 @@ button down over it. It also can be configured to do colormap cycling, and for window transparency. %prep -%setup +%autosetup -p1 %build # easier than patching configure to read those files from own directory @@ -58,6 +59,9 @@ desktop-file-install \ %{_datadir}/applications/* %changelog +* Fri Nov 25 2022 Florian Weimer - 2.43-16 +- Port configure scripts to C99 + * Sat Jul 23 2022 Fedora Release Engineering - 2.43-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 705d1dd0b34fad457bc67c5049bddd1e0b021239 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 07:15:31 +0000 Subject: [PATCH 02/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xdaliclock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xdaliclock.spec b/xdaliclock.spec index df61492..468e4b0 100644 --- a/xdaliclock.spec +++ b/xdaliclock.spec @@ -1,7 +1,7 @@ Summary: A clock for the X Window System Name: xdaliclock Version: 2.43 -Release: 16%{?dist} +Release: 17%{?dist} License: BSD URL: http://www.jwz.org/xdaliclock/ Source0: http://www.jwz.org/xdaliclock/xdaliclock-%{version}.tar.gz @@ -59,6 +59,9 @@ desktop-file-install \ %{_datadir}/applications/* %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 2.43-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Nov 25 2022 Florian Weimer - 2.43-16 - Port configure scripts to C99 From ff85666e424494833d03fead752589932b8973e7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 18:37:39 +0000 Subject: [PATCH 03/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xdaliclock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xdaliclock.spec b/xdaliclock.spec index 468e4b0..9c93578 100644 --- a/xdaliclock.spec +++ b/xdaliclock.spec @@ -1,7 +1,7 @@ Summary: A clock for the X Window System Name: xdaliclock Version: 2.43 -Release: 17%{?dist} +Release: 18%{?dist} License: BSD URL: http://www.jwz.org/xdaliclock/ Source0: http://www.jwz.org/xdaliclock/xdaliclock-%{version}.tar.gz @@ -59,6 +59,9 @@ desktop-file-install \ %{_datadir}/applications/* %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 2.43-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 2.43-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 1a6c39dad7d154b8400cb7e6b0a77da5515ed593 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 09:26:13 +0000 Subject: [PATCH 04/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- xdaliclock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xdaliclock.spec b/xdaliclock.spec index 9c93578..65a0548 100644 --- a/xdaliclock.spec +++ b/xdaliclock.spec @@ -1,7 +1,7 @@ Summary: A clock for the X Window System Name: xdaliclock Version: 2.43 -Release: 18%{?dist} +Release: 19%{?dist} License: BSD URL: http://www.jwz.org/xdaliclock/ Source0: http://www.jwz.org/xdaliclock/xdaliclock-%{version}.tar.gz @@ -59,6 +59,9 @@ desktop-file-install \ %{_datadir}/applications/* %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 2.43-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 2.43-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From f1d2ad45dad368980397bdcf402a8a73ca19f9d8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 09:49:53 +0000 Subject: [PATCH 05/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- xdaliclock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xdaliclock.spec b/xdaliclock.spec index 65a0548..41280e7 100644 --- a/xdaliclock.spec +++ b/xdaliclock.spec @@ -1,7 +1,7 @@ Summary: A clock for the X Window System Name: xdaliclock Version: 2.43 -Release: 19%{?dist} +Release: 20%{?dist} License: BSD URL: http://www.jwz.org/xdaliclock/ Source0: http://www.jwz.org/xdaliclock/xdaliclock-%{version}.tar.gz @@ -59,6 +59,9 @@ desktop-file-install \ %{_datadir}/applications/* %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 2.43-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 2.43-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From fb2158e01dc54e72ee603e44e09d49133f7e386f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 4 Sep 2024 22:51:04 +0200 Subject: [PATCH 06/12] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- xdaliclock.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xdaliclock.spec b/xdaliclock.spec index 41280e7..a9475f9 100644 --- a/xdaliclock.spec +++ b/xdaliclock.spec @@ -1,8 +1,9 @@ Summary: A clock for the X Window System Name: xdaliclock Version: 2.43 -Release: 20%{?dist} -License: BSD +Release: 21%{?dist} +# Automatically converted from old format: BSD - review is highly recommended. +License: LicenseRef-Callaway-BSD URL: http://www.jwz.org/xdaliclock/ Source0: http://www.jwz.org/xdaliclock/xdaliclock-%{version}.tar.gz Source1: xdaliclock.desktop @@ -59,6 +60,9 @@ desktop-file-install \ %{_datadir}/applications/* %changelog +* Wed Sep 04 2024 Miroslav Suchý - 2.43-21 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 2.43-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 4413144d315af67150a324b0f30b74def035f8c1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 15:33:26 +0000 Subject: [PATCH 07/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- xdaliclock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xdaliclock.spec b/xdaliclock.spec index a9475f9..7f727b4 100644 --- a/xdaliclock.spec +++ b/xdaliclock.spec @@ -1,7 +1,7 @@ Summary: A clock for the X Window System Name: xdaliclock Version: 2.43 -Release: 21%{?dist} +Release: 22%{?dist} # Automatically converted from old format: BSD - review is highly recommended. License: LicenseRef-Callaway-BSD URL: http://www.jwz.org/xdaliclock/ @@ -60,6 +60,9 @@ desktop-file-install \ %{_datadir}/applications/* %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 2.43-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Sep 04 2024 Miroslav Suchý - 2.43-21 - convert license to SPDX From 6aa350ed438a15f13fc8ed8e88c0cc68b0bce0e2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:41:31 +0000 Subject: [PATCH 08/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- xdaliclock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xdaliclock.spec b/xdaliclock.spec index 7f727b4..2acdf78 100644 --- a/xdaliclock.spec +++ b/xdaliclock.spec @@ -1,7 +1,7 @@ Summary: A clock for the X Window System Name: xdaliclock Version: 2.43 -Release: 22%{?dist} +Release: 23%{?dist} # Automatically converted from old format: BSD - review is highly recommended. License: LicenseRef-Callaway-BSD URL: http://www.jwz.org/xdaliclock/ @@ -60,6 +60,9 @@ desktop-file-install \ %{_datadir}/applications/* %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 2.43-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 2.43-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From e6e65049da8ee006f28f4f2a5b4fd4f8aa9e7b17 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:31:16 +0000 Subject: [PATCH 09/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- xdaliclock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xdaliclock.spec b/xdaliclock.spec index 2acdf78..824e161 100644 --- a/xdaliclock.spec +++ b/xdaliclock.spec @@ -1,7 +1,7 @@ Summary: A clock for the X Window System Name: xdaliclock Version: 2.43 -Release: 23%{?dist} +Release: 24%{?dist} # Automatically converted from old format: BSD - review is highly recommended. License: LicenseRef-Callaway-BSD URL: http://www.jwz.org/xdaliclock/ @@ -60,6 +60,9 @@ desktop-file-install \ %{_datadir}/applications/* %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 2.43-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Jul 25 2025 Fedora Release Engineering - 2.43-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 991e4526646e277c17c12d3c078e69b598a7bee5 Mon Sep 17 00:00:00 2001 From: Paul Wouters Date: Wed, 22 Apr 2026 15:28:58 -0400 Subject: [PATCH 10/12] - Update to 2.49 - Resolves: rhbz#1211430 - Install schema file for glib2 - Fix X11/configure to not abort on unrecognised options --- .gitignore | 1 + sources | 2 +- xdaliclock.spec | 14 ++++++++++---- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index c6b7fb8..44e3cfa 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ xdaliclock-2.25.tar.gz /xdaliclock-2.43.tar.gz +/xdaliclock-2.49.tar.gz diff --git a/sources b/sources index bb0ecec..9e09be3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1c4a8a827c7ea02295c1bea18b13c8dc xdaliclock-2.43.tar.gz +SHA512 (xdaliclock-2.49.tar.gz) = c797e408f0e9b1cb6d209ebf1ac6a42797a1af50f086c410629202955c23364263924557b13c7f76856c849178a27db285599e439b4863352f6b1f854e98a16e diff --git a/xdaliclock.spec b/xdaliclock.spec index 824e161..3fd3ae0 100644 --- a/xdaliclock.spec +++ b/xdaliclock.spec @@ -1,13 +1,12 @@ Summary: A clock for the X Window System Name: xdaliclock -Version: 2.43 -Release: 24%{?dist} +Version: 2.49 +Release: 1%{?dist} # Automatically converted from old format: BSD - review is highly recommended. License: LicenseRef-Callaway-BSD URL: http://www.jwz.org/xdaliclock/ Source0: http://www.jwz.org/xdaliclock/xdaliclock-%{version}.tar.gz Source1: xdaliclock.desktop -Patch0: xdaliclock-configure-c99.patch BuildRequires: make BuildRequires: gcc BuildRequires: desktop-file-utils @@ -28,6 +27,8 @@ for window transparency. %build # easier than patching configure to read those files from own directory cp /usr/lib/rpm/redhat/config.{guess,sub} . +# workaround for it aborting on unrecognised --disable-dependency-tracking +sed -i "s/^.*exit 2$/echo not aborting/g" X11/configure cd X11 %configure @@ -39,11 +40,15 @@ cd X11 mkdir -p $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 mkdir -p $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults +mkdir -p $RPM_BUILD_ROOT%{_datadir}/glib-2.0/schemas + +install -p -m 0644 org.jwz.xdaliclock.gschema.xml \ + $RPM_BUILD_ROOT%{_datadir}/glib-2.0/schemas/ install -p -m 0755 xdaliclock $RPM_BUILD_ROOT%{_bindir} install -p -m 0644 xdaliclock.man \ $RPM_BUILD_ROOT%{_mandir}/man1/xdaliclock.1 -install -p -m 0644 XDaliClock.ad \ +install -p -m 0644 Xlib-classic/XDaliClock.ad \ $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults/XDaliClock desktop-file-install \ @@ -58,6 +63,7 @@ desktop-file-install \ %{_mandir}/man1/xdaliclock.1* %{_datadir}/X11/app-defaults/XDaliClock %{_datadir}/applications/* +%{_datadir}/glib-2.0/schemas/org.jwz.xdaliclock.gschema.xml %changelog * Sat Jan 17 2026 Fedora Release Engineering - 2.43-24 From 515d1502ad5a23eaa19c4a62dc7c84af08c63614 Mon Sep 17 00:00:00 2001 From: Paul Wouters Date: Wed, 22 Apr 2026 16:03:54 -0400 Subject: [PATCH 11/12] add buildrequires for gtk3-devel --- xdaliclock.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xdaliclock.spec b/xdaliclock.spec index 3fd3ae0..57fa54d 100644 --- a/xdaliclock.spec +++ b/xdaliclock.spec @@ -11,7 +11,7 @@ BuildRequires: make BuildRequires: gcc BuildRequires: desktop-file-utils BuildRequires: libICE-devel, libXmu-devel, libSM-devel, xorg-x11-proto-devel -BuildRequires: libXext-devel, libXaw-devel, libXt-devel +BuildRequires: libXext-devel, libXaw-devel, libXt-devel gtk3-devel BuildRequires: redhat-rpm-config %description From a4623289e8748f7caea7dc54495ff5718a95a8ce Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:04:40 +0000 Subject: [PATCH 12/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- xdaliclock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xdaliclock.spec b/xdaliclock.spec index 57fa54d..9836640 100644 --- a/xdaliclock.spec +++ b/xdaliclock.spec @@ -1,7 +1,7 @@ Summary: A clock for the X Window System Name: xdaliclock Version: 2.49 -Release: 1%{?dist} +Release: 2%{?dist} # Automatically converted from old format: BSD - review is highly recommended. License: LicenseRef-Callaway-BSD URL: http://www.jwz.org/xdaliclock/ @@ -66,6 +66,9 @@ desktop-file-install \ %{_datadir}/glib-2.0/schemas/org.jwz.xdaliclock.gschema.xml %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 2.49-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Sat Jan 17 2026 Fedora Release Engineering - 2.43-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild