From ebe7f12c8706a8e0240491c3e2731561859a3a1b Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 22 Apr 2008 02:29:32 +0000 Subject: [PATCH 1/4] Initialize branch F-9 for xfce4-timer-plugin --- 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 fa8c78e85354b0e4470345af6dc092cb19b0f1b5 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Fri, 28 Nov 2008 00:21:50 +0000 Subject: [PATCH 2/4] - Update to 0.6.1 --- .cvsignore | 2 +- sources | 2 +- xfce4-timer-plugin.spec | 28 +++++++++++++++++++--------- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/.cvsignore b/.cvsignore index 5bc250e..317ec39 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xfce4-timer-plugin-0.6.tar.bz2 +xfce4-timer-plugin-0.6.1.tar.bz2 diff --git a/sources b/sources index 823eaa5..2b23407 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ea50210f54922086c0cd836e3636cacd xfce4-timer-plugin-0.6.tar.bz2 +ba5ae0e25f69517338f74a27fbaf4ca2 xfce4-timer-plugin-0.6.1.tar.bz2 diff --git a/xfce4-timer-plugin.spec b/xfce4-timer-plugin.spec index e5fb5ec..4121ec9 100644 --- a/xfce4-timer-plugin.spec +++ b/xfce4-timer-plugin.spec @@ -1,6 +1,6 @@ Name: xfce4-timer-plugin -Version: 0.6 -Release: 3%{?dist} +Version: 0.6.1 +Release: 1%{?dist} Summary: Timer for the Xfce panel Group: User Interface/Desktops @@ -10,53 +10,63 @@ Source0: http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xfce4-panel-devel >= 4.3.20, libxfcegui4-devel >= 4.3.0 -BuildRequires: libxml2-devel, gettext, perl(XML::Parser) +BuildRequires: libxml2-devel, gettext, intltool, perl(XML::Parser) Requires: xfce4-panel >= 4.4.0 %description A timer for the Xfce panel. It supports countdown periods and alarms at certain times. + %prep %setup -q + %build %configure --disable-static make %{?_smp_mflags} + %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} + %clean rm -rf $RPM_BUILD_ROOT + %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README TODO %{_libexecdir}/xfce4/panel-plugins/xfce4-timer %{_datadir}/xfce4/panel-plugins/*.desktop + %changelog +* Thu Nov 27 2008 Christoph Wickert - 0.6.1-1 +- Update to 0.6.1 +- BR intltool + * Mon Feb 18 2008 Fedora Release Engineering - 0.6-3 - Autorebuild for GCC 4.3 -* Sat Dec 29 2007 Christoph Wickert - 0.6-2 +* Sat Dec 29 2007 Christoph Wickert - 0.6-2 - Bump release due to tag collision -* Sat Dec 29 2007 Christoph Wickert - 0.6-1 +* Sat Dec 29 2007 Christoph Wickert - 0.6-1 - Update to 0.6 -* Sat Aug 25 2007 Christoph Wickert - 0.5.1-3 +* Sat Aug 25 2007 Christoph Wickert - 0.5.1-3 - Rebuild for BuildID feature - Update license tag -* Sat Apr 28 2007 Christoph Wickert - 0.5.1-2 +* Sat Apr 28 2007 Christoph Wickert - 0.5.1-2 - Rebuild for Xfce 4.4.1 -* Sat Jan 27 2007 Christoph Wickert - 0.5.1-1 +* Sat Jan 27 2007 Christoph Wickert - 0.5.1-1 - Update to 0.5.1 on Xfce 4.4. -* Sat Sep 23 2006 Christoph Wickert - 0.5-1 +* Sat Sep 23 2006 Christoph Wickert - 0.5-1 - Initial Fedora Extras version. From d2a95c8b4edf03a38a384c857f4b0637fc1d0347 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:32:19 +0000 Subject: [PATCH 3/4] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 997cb07..ae18297 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: xfce4-timer-plugin -# $Id$ +# $Id: Makefile,v 1.1 2006/12/21 14:26:50 cwickert Exp $ NAME := xfce4-timer-plugin 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 a533bf6a7910ed49a7a5d310a7b51dd00b518e18 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:48:08 +0000 Subject: [PATCH 4/4] 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 ae18297..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xfce4-timer-plugin -# $Id: Makefile,v 1.1 2006/12/21 14:26:50 cwickert Exp $ -NAME := xfce4-timer-plugin -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