diff --git a/.gitignore b/.gitignore index 44e3cfa..c6b7fb8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ xdaliclock-2.25.tar.gz /xdaliclock-2.43.tar.gz -/xdaliclock-2.49.tar.gz diff --git a/sources b/sources index 9e09be3..bb0ecec 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xdaliclock-2.49.tar.gz) = c797e408f0e9b1cb6d209ebf1ac6a42797a1af50f086c410629202955c23364263924557b13c7f76856c849178a27db285599e439b4863352f6b1f854e98a16e +1c4a8a827c7ea02295c1bea18b13c8dc xdaliclock-2.43.tar.gz diff --git a/xdaliclock-configure-c99.patch b/xdaliclock-configure-c99.patch deleted file mode 100644 index a0bfd73..0000000 --- a/xdaliclock-configure-c99.patch +++ /dev/null @@ -1,26 +0,0 @@ -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 9836640..2fb9cde 100644 --- a/xdaliclock.spec +++ b/xdaliclock.spec @@ -1,17 +1,15 @@ Summary: A clock for the X Window System Name: xdaliclock -Version: 2.49 -Release: 2%{?dist} -# Automatically converted from old format: BSD - review is highly recommended. -License: LicenseRef-Callaway-BSD +Version: 2.43 +Release: 11%{?dist} +License: BSD URL: http://www.jwz.org/xdaliclock/ Source0: http://www.jwz.org/xdaliclock/xdaliclock-%{version}.tar.gz Source1: xdaliclock.desktop -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 gtk3-devel +BuildRequires: libXext-devel, libXaw-devel, libXt-devel BuildRequires: redhat-rpm-config %description @@ -22,13 +20,11 @@ button down over it. It also can be configured to do colormap cycling, and for window transparency. %prep -%autosetup -p1 +%setup %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 @@ -40,15 +36,11 @@ 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 Xlib-classic/XDaliClock.ad \ +install -p -m 0644 XDaliClock.ad \ $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults/XDaliClock desktop-file-install \ @@ -63,51 +55,8 @@ 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 -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* Sat Jul 23 2022 Fedora Release Engineering - 2.43-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 2.43-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 2.43-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 2.43-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - * Wed Jul 29 2020 Fedora Release Engineering - 2.43-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild