diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 5ec1ebd..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -tzclock-2.6.1.tar.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..bedb942 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/tzclock-*.tar.bz2 diff --git a/Makefile b/Makefile deleted file mode 100644 index 15a38ed..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: tzclock -# $Id$ -NAME := tzclock -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/sources b/sources index 63229e2..8d86c99 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4f85774559b7d837c991e5c194ae6dc7 tzclock-2.6.1.tar.gz +SHA512 (tzclock-4.9.tar.bz2) = 846793d9fe9eaeb82caea2086faea14d072f1800b2953852a585e76dff195d8340659b4ffc04c5f9a1d93d3fc19a00592b2d217b0eed014c24465b603b9b7e74 diff --git a/tzclock.spec b/tzclock.spec index f956f2e..1cf40d8 100644 --- a/tzclock.spec +++ b/tzclock.spec @@ -1,72 +1,207 @@ Name: tzclock -Version: 2.6.1 -Release: 3%{?dist} +Version: 4.9 +Release: 1%{?dist} Summary: GTK+ graphical Clock displaying the time around the world -Group: Amusements/Graphics -License: GPLv2 -URL: http://www.tzclock.org/ -Source0: http://www.tzclock.org/releases/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# SPDX confirmed +License: GPL-2.0-only +URL: https://theknight.co.uk/ +Source0: http://theknight.co.uk/releases/Source/%{name}-%{version}.tar.bz2 -BuildRequires: libgnomeui-devel -BuildRequires: librsvg2-devel +BuildRequires: make +BuildRequires: gcc +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(libnotify) +BuildRequires: pkgconfig(dial) +BuildRequires: /usr/bin/appstream-util BuildRequires: desktop-file-utils %description TzClock is an X Window GTK+ graphical Clock that can display the time around the world. It supports multiple faces showing different time zones. -There is a stopwatch funtion that is accurate to a tenth of a second, +There is a stopwatch function that is accurate to a tenth of a second, plus there are many other nice features for you to discover. %prep %setup -q +sed -i.suffix \ + -e 's|^Icon=.*|Icon=tzclock|' \ + %{name}.desktop + %build %configure +%make_build -k %{__make} %{?_smp_mflags} %install -%{__rm} -rf $RPM_BUILD_ROOT +%make_install -# Manual install -for dir in \ - %{_bindir} \ - %{_datadir}/{applications,pixmaps} \ - %{_mandir}/man1 - do - %{__mkdir_p} $RPM_BUILD_ROOT$dir -done - -%{__install} -p -m 0755 TzClockCairo $RPM_BUILD_ROOT%{_bindir}/TzClock -%{__install} -p -m 0644 TzClock.svg $RPM_BUILD_ROOT%{_datadir}/pixmaps/ -%{__install} -p -m 0644 TzClock.man $RPM_BUILD_ROOT%{_mandir}/man1/TzClock.1 - -desktop-file-install \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --vendor fedora \ - TzClock.desktop - -# I like lower case! -%{__ln_s} -f TzClock $RPM_BUILD_ROOT%{_bindir}/%{name} -%{__ln_s} -f TzClock.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1 - -%clean -%{__rm} -rf $RPM_BUILD_ROOT +%check +desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop +appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.metainfo.xml %files %defattr(-,root,root,-) %doc AUTHORS -%doc COPYING +%license COPYING %{_bindir}/* -%{_datadir}/pixmaps/*svg -%{_datadir}/applications/*desktop +%{_metainfodir}/*.metainfo.xml +%{_datadir}/icons/hicolor/*/*/tzclock* +%{_datadir}/applications/%{name}.desktop -%{_mandir}/man1/* +%{_mandir}/man1/%{name}.1* %changelog +* Thu Aug 20 2026 Mamoru TASAKA - 4.9-1 +- 4.9 + +* Fri Jul 17 2026 Fedora Release Engineering - 3.1.7-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + +* Sat Jan 17 2026 Fedora Release Engineering - 3.1.7-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Fri Jul 25 2025 Fedora Release Engineering - 3.1.7-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Sun Jan 19 2025 Fedora Release Engineering - 3.1.7-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Sat Jul 20 2024 Fedora Release Engineering - 3.1.7-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sat Jan 27 2024 Fedora Release Engineering - 3.1.7-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Dec 30 2023 Mamoru TASAKA - 3.1.7-13 +- SPDX migration + +* Sat Jul 22 2023 Mamoru TASAKA - 3.1.7-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 3.1.7-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 3.1.7-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 3.1.7-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 3.1.7-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 3.1.7-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 3.1.7-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jan 31 2020 Fedora Release Engineering - 3.1.7-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 3.1.7-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 3.1.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 3.1.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Feb 13 2018 Mamoru TASAKA - 3.1.7-1 +- 3.1.7 + +* Fri Feb 09 2018 Fedora Release Engineering - 3.0.6-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Jan 18 2018 Igor Gnatenko - 3.0.6-6 +- Remove obsolete scriptlets + +* Thu Aug 03 2017 Fedora Release Engineering - 3.0.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 3.0.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 3.0.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Feb 05 2016 Fedora Release Engineering - 3.0.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Sep 25 2015 Mamoru TASAKA - 3.0.6-1 +- 3.0.6 + +* Fri Jun 19 2015 Fedora Release Engineering - 3.0.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon Aug 18 2014 Fedora Release Engineering - 3.0.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 3.0.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Mon May 19 2014 Mamoru TASAKA - 3.0.5-1 +- 3.0.5 + +* Sun Aug 04 2013 Fedora Release Engineering - 3.0.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Sun Mar 10 2013 Mamoru TASAKA - 3.0.3-1 +- 3.0.3 + +* Sat Feb 9 2013 Mamoru TASAKA - 3.0.2-2 +- F-19: kill vendorization of desktop file (fpc#247) + +* Thu Nov 15 2012 Mamoru TASAKA - 3.0.2-1 +- 3.0.2 + +* Sun Jul 22 2012 Fedora Release Engineering - 3.0.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Jan 5 2012 Mamoru Tasaka - 3.0.1-2 +- F-17: rebuild against gcc47 + +* Sun Nov 20 2011 Mamoru Tasaka - 3.0.1-1 +- 3.0.1 + +* Wed Nov 9 2011 Mamoru Tasaka - 2.7.7-3 +- Rebuild + +* Wed Feb 09 2011 Fedora Release Engineering - 2.7.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Thu Jun 3 2010 Mamoru Tasaka - 2.7.7-1 +- 2.7.7 + +* Sun Feb 14 2010 Mamoru Tasaka - 2.7.6-2 +- Fix F-13 DSO linkage issue + +* Sat Nov 21 2009 Mamoru Tasaka - 2.7.6-1 +- 2.7.6 + +* Thu Jul 30 2009 Mamoru Tasaka - 2.7.5-1 +- 2.7.5 + +* Sat Jul 25 2009 Mamoru Tasaka - 2.7.4-2 +- F-12: Mass rebuild + +* Tue Mar 24 2009 Mamoru Tasaka - 2.7.4-1 +- 2.7.4 + +* Tue Feb 24 2009 Mamoru Tasaka - 2.7.2-2 +- F-11: Mass rebuild + +* Thu Sep 25 2008 Mamoru Tasaka - 2.7.2-1 +- 2.7.2 + +* Thu May 15 2008 Mamoru Tasaka - 2.7.1-1 +- 2.7.1 + * Sat Apr 12 2008 Mamoru Tasaka - 2.6.1-3 - "New" 2.6.1 (modified tarball with the same version)