From b07062082a73482b1099f9d6cdbe5ee886e667d2 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 21 Apr 2008 23:50:53 +0000 Subject: [PATCH 1/8] Initialize branch F-9 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..1c26f78 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-9 From d1d61fb9582573a9ec6c5521f2ecba53ddd9bd57 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Thu, 15 May 2008 14:11:44 +0000 Subject: [PATCH 2/8] - 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 04b10136aab2865d415247d291cf25141c453f23 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Wed, 24 Sep 2008 15:36:59 +0000 Subject: [PATCH 3/8] 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 a76ee397f3333b84f2d36bb89df1c654a2670e21 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Mon, 23 Mar 2009 17:00:29 +0000 Subject: [PATCH 4/8] - 2.7.4 --- .cvsignore | 2 +- sources | 2 +- tzclock.spec | 14 ++++++++++---- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index fad180b..5bfbff1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -tzclock-2.7.2.tar.gz +tzclock-2.7.4.tar.bz2 diff --git a/sources b/sources index 5de70d1..8a1141c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2b47c36a978373b401e61a8f23d78377 tzclock-2.7.2.tar.gz +bd369d591cd9243775e2f4c92cd4af90 tzclock-2.7.4.tar.bz2 diff --git a/tzclock.spec b/tzclock.spec index 780b095..8611fb6 100644 --- a/tzclock.spec +++ b/tzclock.spec @@ -1,16 +1,16 @@ Name: tzclock -Version: 2.7.2 +Version: 2.7.4 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 +Source0: http://www.tzclock.org/releases/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgnomeui-devel -BuildRequires: librsvg2-devel +#BuildRequires: librsvg2-devel BuildRequires: desktop-file-utils %description @@ -39,7 +39,7 @@ for dir in \ %{__mkdir_p} $RPM_BUILD_ROOT$dir done -%{__install} -p -m 0755 TzClockCairo $RPM_BUILD_ROOT%{_bindir}/TzClock +%{__install} -p -m 0755 TzClock $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 @@ -67,6 +67,12 @@ desktop-file-install \ %{_mandir}/man1/* %changelog +* 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 From 9d129f773194446d4e27cbe2e5fe6288ee077d9f Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Mon, 23 Mar 2009 17:22:51 +0000 Subject: [PATCH 5/8] Explicitly add BR: gtk2-devel for F-9 --- tzclock.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/tzclock.spec b/tzclock.spec index 8611fb6..5e2709a 100644 --- a/tzclock.spec +++ b/tzclock.spec @@ -10,6 +10,7 @@ Source0: http://www.tzclock.org/releases/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgnomeui-devel +BuildRequires: gtk2-devel #BuildRequires: librsvg2-devel BuildRequires: desktop-file-utils From 8778240f406095c798daf024287c5898398f051b Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Mon, 23 Mar 2009 17:36:18 +0000 Subject: [PATCH 6/8] Instead add BR: gail-devel --- tzclock.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tzclock.spec b/tzclock.spec index 5e2709a..e8e4181 100644 --- a/tzclock.spec +++ b/tzclock.spec @@ -10,7 +10,9 @@ Source0: http://www.tzclock.org/releases/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgnomeui-devel -BuildRequires: gtk2-devel +%if 0%{?fedora} <= 9 +BuildRequires: gail-devel +%endif #BuildRequires: librsvg2-devel BuildRequires: desktop-file-utils From d9668bdcae52ee07fa59015665c33f25c1b8e813 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:34:14 +0000 Subject: [PATCH 7/8] 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 c38ebece71fabbe4d0ee4988889525ff995fe886 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:35:29 +0000 Subject: [PATCH 8/8] 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 1c26f78..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-9