From f5434de7c63e59c199ba6ff93014c77b25ac1505 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 5 Dec 2007 19:34:42 +0000 Subject: [PATCH 01/10] Initialize branch F-8 for tzclock --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..e9e7ccd --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-8 From a2e299f7b2ae906e849b08e9885c78fd1b56f4d5 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Thu, 6 Dec 2007 02:10:42 +0000 Subject: [PATCH 02/10] Initial import --- .cvsignore | 1 + sources | 1 + tzclock.spec | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 74 insertions(+) create mode 100644 tzclock.spec diff --git a/.cvsignore b/.cvsignore index e69de29..f415fc9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +tzclock-2.5.5.tar.gz diff --git a/sources b/sources index e69de29..820d1b6 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +b92983b84ed4db2f028c3831cc1c1869 tzclock-2.5.5.tar.gz diff --git a/tzclock.spec b/tzclock.spec new file mode 100644 index 0000000..830568a --- /dev/null +++ b/tzclock.spec @@ -0,0 +1,72 @@ +Name: tzclock +Version: 2.5.5 +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) + +BuildRequires: libgnomeui-devel +BuildRequires: librsvg2-devel +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, +plus there are many other nice features for you to discover. + +%prep +%setup -q + +%build +%configure +%{__make} %{?_smp_mflags} + +%install +%{__rm} -rf $RPM_BUILD_ROOT + +# 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 + +%files +%defattr(-,root,root,-) +%doc AUTHORS +%doc COPYING + +%{_bindir}/* +%{_datadir}/pixmaps/*svg +%{_datadir}/applications/*desktop + +%{_mandir}/man1/* + +%changelog +* Wed Dec 5 2007 Mamoru Tasaka 2.5.5-1 +- Initial packaging + From fed910527a50ca10094bc617d9e5fbe020df7178 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Thu, 10 Apr 2008 15:33:44 +0000 Subject: [PATCH 03/10] - 2.6.1 --- .cvsignore | 2 +- sources | 2 +- tzclock.spec | 10 ++++++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index f415fc9..5ec1ebd 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -tzclock-2.5.5.tar.gz +tzclock-2.6.1.tar.gz diff --git a/sources b/sources index 820d1b6..31cac17 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b92983b84ed4db2f028c3831cc1c1869 tzclock-2.5.5.tar.gz +597bc75e9731117720e8673fcb3e95a5 tzclock-2.6.1.tar.gz diff --git a/tzclock.spec b/tzclock.spec index 830568a..28dd332 100644 --- a/tzclock.spec +++ b/tzclock.spec @@ -1,5 +1,5 @@ Name: tzclock -Version: 2.5.5 +Version: 2.6.1 Release: 1%{?dist} Summary: GTK+ graphical Clock displaying the time around the world @@ -67,6 +67,12 @@ desktop-file-install \ %{_mandir}/man1/* %changelog -* Wed Dec 5 2007 Mamoru Tasaka 2.5.5-1 +* Fri Apr 11 2008 Mamoru Tasaka - 2.6.1-1 +- 2.6.1 + +* Sat Feb 9 2008 Mamoru Tasaka +- Rebuild against gcc43 (F-9) + +* Wed Dec 5 2007 Mamoru Tasaka - 2.5.5-1 - Initial packaging From e30aa2b332c79dda01459efd0657b647dc45f85d Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Thu, 10 Apr 2008 17:29:08 +0000 Subject: [PATCH 04/10] add a small patch --- tzclock-2.6.1-implicit-declaration.patch | 10 ++++++++++ tzclock.spec | 4 +++- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 tzclock-2.6.1-implicit-declaration.patch diff --git a/tzclock-2.6.1-implicit-declaration.patch b/tzclock-2.6.1-implicit-declaration.patch new file mode 100644 index 0000000..c0ebd56 --- /dev/null +++ b/tzclock-2.6.1-implicit-declaration.patch @@ -0,0 +1,10 @@ +--- tzclock-2.6.1/src/screenSize.c.debug 2007-09-30 02:54:23.000000000 +0900 ++++ tzclock-2.6.1/src/screenSize.c 2008-04-11 02:16:05.000000000 +0900 +@@ -27,6 +27,7 @@ + */ + #include + #include ++#include + + /*----------------------------------------------------------------------------------------------------* + * * diff --git a/tzclock.spec b/tzclock.spec index 28dd332..b8af156 100644 --- a/tzclock.spec +++ b/tzclock.spec @@ -7,6 +7,7 @@ Group: Amusements/Graphics License: GPLv2 URL: http://www.tzclock.org/ Source0: http://www.tzclock.org/releases/%{name}-%{version}.tar.gz +Patch0: tzclock-2.6.1-implicit-declaration.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgnomeui-devel @@ -22,6 +23,7 @@ plus there are many other nice features for you to discover. %prep %setup -q +%patch0 -p1 -b .def %build %configure @@ -67,7 +69,7 @@ desktop-file-install \ %{_mandir}/man1/* %changelog -* Fri Apr 11 2008 Mamoru Tasaka - 2.6.1-1 +* Fri Apr 11 2008 Mamoru Tasaka - 2.6.1-2 - 2.6.1 * Sat Feb 9 2008 Mamoru Tasaka From eab0c8d2b6dc7cd5efbaba61f66f70b5d004d1dd Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Thu, 10 Apr 2008 17:33:03 +0000 Subject: [PATCH 05/10] orz --- tzclock.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tzclock.spec b/tzclock.spec index b8af156..3ba72fb 100644 --- a/tzclock.spec +++ b/tzclock.spec @@ -1,6 +1,6 @@ Name: tzclock Version: 2.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK+ graphical Clock displaying the time around the world Group: Amusements/Graphics From aafdf21822f0a2e2228cd2eb77161aabd20f4485 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Fri, 11 Apr 2008 17:19:07 +0000 Subject: [PATCH 06/10] - "New" 2.6.1 (modified tarball with the same version) --- sources | 2 +- tzclock-2.6.1-implicit-declaration.patch | 10 ---------- tzclock.spec | 7 ++++--- 3 files changed, 5 insertions(+), 14 deletions(-) delete mode 100644 tzclock-2.6.1-implicit-declaration.patch diff --git a/sources b/sources index 31cac17..63229e2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -597bc75e9731117720e8673fcb3e95a5 tzclock-2.6.1.tar.gz +4f85774559b7d837c991e5c194ae6dc7 tzclock-2.6.1.tar.gz diff --git a/tzclock-2.6.1-implicit-declaration.patch b/tzclock-2.6.1-implicit-declaration.patch deleted file mode 100644 index c0ebd56..0000000 --- a/tzclock-2.6.1-implicit-declaration.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- tzclock-2.6.1/src/screenSize.c.debug 2007-09-30 02:54:23.000000000 +0900 -+++ tzclock-2.6.1/src/screenSize.c 2008-04-11 02:16:05.000000000 +0900 -@@ -27,6 +27,7 @@ - */ - #include - #include -+#include - - /*----------------------------------------------------------------------------------------------------* - * * diff --git a/tzclock.spec b/tzclock.spec index 3ba72fb..f956f2e 100644 --- a/tzclock.spec +++ b/tzclock.spec @@ -1,13 +1,12 @@ Name: tzclock Version: 2.6.1 -Release: 2%{?dist} +Release: 3%{?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 -Patch0: tzclock-2.6.1-implicit-declaration.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgnomeui-devel @@ -23,7 +22,6 @@ plus there are many other nice features for you to discover. %prep %setup -q -%patch0 -p1 -b .def %build %configure @@ -69,6 +67,9 @@ desktop-file-install \ %{_mandir}/man1/* %changelog +* Sat Apr 12 2008 Mamoru Tasaka - 2.6.1-3 +- "New" 2.6.1 (modified tarball with the same version) + * Fri Apr 11 2008 Mamoru Tasaka - 2.6.1-2 - 2.6.1 From 6a1bb22c7ebc903f3703f2e06e31408ccd278d8b Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Thu, 15 May 2008 14:11:34 +0000 Subject: [PATCH 07/10] - 2.7.1 --- .cvsignore | 2 +- sources | 2 +- tzclock.spec | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 5ec1ebd..6f02125 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -tzclock-2.6.1.tar.gz +tzclock-2.7.1.tar.gz diff --git a/sources b/sources index 63229e2..94b5133 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4f85774559b7d837c991e5c194ae6dc7 tzclock-2.6.1.tar.gz +4546a3bd5fe7b473a6af18e689435164 tzclock-2.7.1.tar.gz diff --git a/tzclock.spec b/tzclock.spec index f956f2e..76d53ea 100644 --- a/tzclock.spec +++ b/tzclock.spec @@ -1,6 +1,6 @@ Name: tzclock -Version: 2.6.1 -Release: 3%{?dist} +Version: 2.7.1 +Release: 1%{?dist} Summary: GTK+ graphical Clock displaying the time around the world Group: Amusements/Graphics @@ -67,6 +67,9 @@ desktop-file-install \ %{_mandir}/man1/* %changelog +* 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) From ba1d1bcff060d1f264eda5d0bce042a80d02e623 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Wed, 24 Sep 2008 15:36:58 +0000 Subject: [PATCH 08/10] ruby-mechanize, ruby-aws, tzclock update --- .cvsignore | 2 +- sources | 2 +- tzclock.spec | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 6f02125..fad180b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -tzclock-2.7.1.tar.gz +tzclock-2.7.2.tar.gz diff --git a/sources b/sources index 94b5133..5de70d1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4546a3bd5fe7b473a6af18e689435164 tzclock-2.7.1.tar.gz +2b47c36a978373b401e61a8f23d78377 tzclock-2.7.2.tar.gz diff --git a/tzclock.spec b/tzclock.spec index 76d53ea..780b095 100644 --- a/tzclock.spec +++ b/tzclock.spec @@ -1,5 +1,5 @@ Name: tzclock -Version: 2.7.1 +Version: 2.7.2 Release: 1%{?dist} Summary: GTK+ graphical Clock displaying the time around the world @@ -67,6 +67,9 @@ desktop-file-install \ %{_mandir}/man1/* %changelog +* 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 From e7d3f87f759aed5c4c033c9d909b49b45be4e5df Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:34:14 +0000 Subject: [PATCH 09/10] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 15a38ed..8da371a 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 050922912de4069514733f6e0c6e378c30112722 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:35:23 +0000 Subject: [PATCH 10/10] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 8da371a..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 $$d/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/branch b/branch deleted file mode 100644 index e9e7ccd..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-8