From a9104ca7da0e229e82bee69aefbaefd91df0e2ec Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 18 May 2007 11:23:17 +0000 Subject: [PATCH 1/5] Initialize branch F-7 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..c48525c --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-7 From c1a293622a7971eb8ef7e8d4de8745c0a0e6a7cc Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Sat, 29 Dec 2007 16:02:55 +0000 Subject: [PATCH 2/5] - Update to 0.6 --- .cvsignore | 2 +- sources | 2 +- xfce4-timer-plugin.spec | 13 ++++++++++--- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 62d2970..5bc250e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xfce4-timer-plugin-0.5.1.tar.bz2 +xfce4-timer-plugin-0.6.tar.bz2 diff --git a/sources b/sources index 0ab9cf1..823eaa5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0036d3805cbe051d35e8ec595237e88c xfce4-timer-plugin-0.5.1.tar.bz2 +ea50210f54922086c0cd836e3636cacd xfce4-timer-plugin-0.6.tar.bz2 diff --git a/xfce4-timer-plugin.spec b/xfce4-timer-plugin.spec index ce30fea..c09a8b5 100644 --- a/xfce4-timer-plugin.spec +++ b/xfce4-timer-plugin.spec @@ -1,10 +1,10 @@ Name: xfce4-timer-plugin -Version: 0.5.1 -Release: 2%{?dist} +Version: 0.6 +Release: 1%{?dist} Summary: Timer for the Xfce panel Group: User Interface/Desktops -License: GPL +License: GPLv2+ URL: http://goodies.xfce.org/projects/panel-plugins/%{name} Source0: http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -39,6 +39,13 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/xfce4/panel-plugins/*.desktop %changelog +* Sat Dec 29 2007 Christoph Wickert - 0.6-1 +- Update to 0.6 + +* 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 - Rebuild for Xfce 4.4.1 From 5afe4d95d70bc680ce13c693828fedb89e46e11e Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Sat, 29 Dec 2007 16:12:18 +0000 Subject: [PATCH 3/5] - Bump release due to tag collision --- xfce4-timer-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce4-timer-plugin.spec b/xfce4-timer-plugin.spec index c09a8b5..b75518e 100644 --- a/xfce4-timer-plugin.spec +++ b/xfce4-timer-plugin.spec @@ -1,6 +1,6 @@ Name: xfce4-timer-plugin Version: 0.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Timer for the Xfce panel Group: User Interface/Desktops @@ -39,6 +39,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/xfce4/panel-plugins/*.desktop %changelog +* Sat Dec 29 2007 Christoph Wickert - 0.6-2 +- Bump release due to tag collision + * Sat Dec 29 2007 Christoph Wickert - 0.6-1 - Update to 0.6 From 77df9b3126168a3f44051409745af82c18d9cadc Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:32:18 +0000 Subject: [PATCH 4/5] 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 da66c5e7c8de4a09931cc66394e45bf07e8e047f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:48:04 +0000 Subject: [PATCH 5/5] 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 c48525c..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-7