diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 8fdd712..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -tzclock-2.7.6.tar.bz2 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..41c700b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +tzclock-2.7.7.tar.bz2 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/sources b/sources index 5018c31..ba50b83 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -94d10e9195629de12bad3d7a6cc65563 tzclock-2.7.6.tar.bz2 +9973f99c0a1114468cb5eec08975fd92 tzclock-2.7.7.tar.bz2 diff --git a/tzclock-2.7.6-DSOlinkage.patch b/tzclock-2.7.6-DSOlinkage.patch deleted file mode 100644 index 4c678b4..0000000 --- a/tzclock-2.7.6-DSOlinkage.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- tzclock-2.7.6/configure.ac.DSO 2009-09-24 16:24:18.000000000 +0900 -+++ tzclock-2.7.6/configure.ac 2010-02-14 02:43:15.000000000 +0900 -@@ -13,6 +13,7 @@ - - # Checks for libraries. - PKG_CHECK_MODULES(DEPS, libgnomeui-2.0 gtk+-2.0 >= 2.4.0) -+AC_CHECK_LIB(m, lrint, [DEPS_LIBS="$DEPS_LIBS -lm"]) - - AC_SUBST(DEPS_CFLAGS) - AC_SUBST(DEPS_LIBS) diff --git a/tzclock.spec b/tzclock.spec index 4660748..9ced1f7 100644 --- a/tzclock.spec +++ b/tzclock.spec @@ -1,22 +1,17 @@ Name: tzclock -Version: 2.7.6 -Release: 2%{?dist} +Version: 2.7.7 +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.bz2 -# Patch0 needs autotool -Patch0: tzclock-2.7.6-DSOlinkage.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgnomeui-devel BuildRequires: desktop-file-utils -# For Patch0 -BuildRequires: automake - %description TzClock is an X Window GTK+ graphical Clock that can display the time around the world. It supports multiple faces showing @@ -26,10 +21,6 @@ plus there are many other nice features for you to discover. %prep %setup -q -%patch0 -p1 -b .DSO - -# For Patch0 -autoreconf -fi %build %configure @@ -75,6 +66,9 @@ desktop-file-install \ %{_mandir}/man1/* %changelog +* 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