5 changed files with 85 additions and 199 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1 @@
 wmCalClock-1.25.tar.gz
-/wmcalclock-1.26.tar.xz
--- a/1.26-fix-KnR-prototypes.patch
+++ b/1.26-fix-KnR-prototypes.patch
@ -1,43 +0,0 @@
-diff --git a/Src/wmCalClock.c b/Src/wmCalClock.c
-index 4ba7780..6365e92 100644
--- a/Src/wmCalClock.c
-+++ b/Src/wmCalClock.c
-@@ -124,6 +124,8 @@ void ParseCMDLine(int argc, char *argv[]);
- void ButtonPressEvent(XButtonEvent *);
- void print_usage();
- 
-+double hour24(double hour);
-+double jd(int ny, int nm, int nd, double UT);
- 
- 
- 
-@@ -310,7 +312,7 @@ int main(int argc, char *argv[]) {
-     int 		Year, Month, DayOfWeek, DayOfMonth, OldDayOfMonth;
-     int			Hours, Mins, Secs, OldSecs, digit, xoff, D[10], xsize;
-     time_t		CurrentLocalTime;
-    double		UT, TU, TU2, TU3, T0, gmst, jd(), hour24();
-+    double		UT, TU, TU2, TU3, T0, gmst;
- 
- 
-     /*
-@@ -939,9 +941,7 @@ void print_usage(){
-  *  Compute the Julian Day number for the given date.
-  *  Julian Date is the number of days since noon of Jan 1 4713 B.C.
-  */
-double jd(ny, nm, nd, UT)
-int ny, nm, nd;
-double UT;
-+double jd(int ny, int nm, int nd, double UT)
- {
-         double A, B, C, D, JD, day;
- 
-@@ -976,8 +976,7 @@ double UT;
- 
- }
- 
-double hour24(hour)
-double hour;
-+double hour24(double hour)
- {
-         int n;
- 
--- a/136
+++ b/136
@ -1,136 +0,0 @@
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.25-42
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Fri Jul 26 2024 Miroslav Suchý <msuchy@redhat.com> - 1.25-41
- convert license to SPDX
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.25-40
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.25-39
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.25-38
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.25-37
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.25-36
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.25-35
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.25-34
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.25-33
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.25-32
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Sun Mar 01 2020 Jani Juhani Sinervo <jani@sinervo.fi> - 1.25-31
- Fix build error on Rawhide and Fedora 32
- Update old URLs
-* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.25-30
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.25-29
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.25-28
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.25-27
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.25-26
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.25-25
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.25-24
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.25-23
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.25-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Mon Feb 18 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.25-11
- Autorebuild for GCC 4.3
-
-* Mon Feb 11 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - 1.25-10
- Rebuilt for gcc43
-
-* Thu Aug 23 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- 1.25-9
- new license tag
- rebuild for buildid
-
-* Fri Sep 15 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-1.25-8
- FE6 rebuild
-
-* Sat Apr 22 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-1.25-7
- put manpage into right location (David Kovalsky)
-
-* Thu Feb 16 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-1.25-6
- Rebuild for Fedora Extras 5
-
-* Fri Nov 25 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-1.25-5
- modular xorg integration
-
-* Mon Sep 26 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-1.25-4
- try to fix x86_64 build (libdir)
-
-* Mon Sep 26 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-1.25-3
- add dist
-
-* Mon Sep 26 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-1.25-2
- add -p and to install
- man page should be 644
-
-* Fri Jun 03 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-1.25-1
- Initial Release
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (wmcalclock-1.26.tar.xz) = 11045933d38b3c3aa56ea01f5b2190ee1d622927c20bf639d2ffc77b5c685344bcf15a501da7a29605f5ba88846de8d58f59114165bd7d9340ed58009876ff35
+70c47ec1d8f8ec7e3ed7eb2d3105d371  wmCalClock-1.25.tar.gz
--- a/wmCalClock.spec
+++ b/wmCalClock.spec
@ -1,39 +1,105 @@
 Name:           wmCalClock
-Version:        1.26
-Release:        %autorelease
+Version:        1.25
+Release:        16%{?dist}
 Summary:        A Calendar clock with antialiased text

-License:        GPL-2.0-or-later
-URL:            https://www.dockapps.net/wmcalclock
-Source0:        https://www.dockapps.net/download/wmcalclock-%{version}.tar.xz
+Group:          User Interface/X
+License:        GPLv2+
+URL:            http://www.dockapps.org/file.php/id/9
+Source0:        http://www.dockapps.org/download.php/id/16/wmCalClock-1.25.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

-Patch0:         1.26-fix-KnR-prototypes.patch
-
-BuildRequires:  make
-BuildRequires:  gcc
 BuildRequires:  libX11-devel
 BuildRequires:  libXext-devel
-BuildRequires:  libXpm-devel
-BuildRequires:  git-core
+BuildRequireS:  libXpm-devel

 %description
 %{summary}

 %prep
-%autosetup -n wmcalclock-%{version} -S git
+%setup -q
+

 %build
-%configure
-%make_build
+cd Src
+make CFLAGS="${RPM_OPT_FLAGS}" LIBDIR="-L%{_usr}/X11R6/%{_lib}" %{?_smp_mflags}
 
 %install
-%make_install
+rm -rf $RPM_BUILD_ROOT
+
+%{__mkdir_p} ${RPM_BUILD_ROOT}%{_bindir}
+%{__mkdir_p} ${RPM_BUILD_ROOT}%{_mandir}/man1/
+
+%{__install} -p %{_builddir}/%{name}-%{version}/Src/wmCalClock \
+${RPM_BUILD_ROOT}%{_bindir}
+%{__install} -p -m644 %{_builddir}/%{name}-%{version}/Src/wmCalClock.1 \
+${RPM_BUILD_ROOT}%{_mandir}/man1/
+%clean
+rm -rf $RPM_BUILD_ROOT
+

 %files
-%doc BUGS CHANGES HINTS README TODO
-%license COPYING
+%defattr(-,root,root,-)
+%doc BUGS CHANGES COPYING HINTS README TODO
 %{_bindir}/wmCalClock
 %{_mandir}/man1/wmCalClock.1*

 %changelog
-%autochangelog
+* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Feb 18 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.25-11
+- Autorebuild for GCC 4.3
+
+* Mon Feb 11 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - 1.25-10
+- Rebuilt for gcc43
+
+* Thu Aug 23 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.25-9
+- new license tag
+- rebuild for buildid
+
+* Fri Sep 15 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.25-8
+- FE6 rebuild
+
+* Sat Apr 22 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.25-7
+- put manpage into right location (David Kovalsky)
+
+* Thu Feb 16 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.25-6
+- Rebuild for Fedora Extras 5
+
+* Fri Nov 25 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.25-5
+- modular xorg integration
+
+* Mon Sep 26 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.25-4
+- try to fix x86_64 build (libdir)
+
+* Mon Sep 26 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.25-3
+- add dist
+
+* Mon Sep 26 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.25-2
+- add -p and to install
+- man page should be 644
+
+* Fri Jun 03 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.25-1
+- Initial Release