From 1aad864acf629b18460a697b22d11f8a0b811a96 Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Mon, 23 Oct 2006 19:36:15 +0000 Subject: [PATCH 1/5] Initialize branch FC-6 for xfce4-dev-tools --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..d5b6362 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +FC-6 From 827af3b347d33fde9fe2f885fc8e0d6a58f8c103 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Sat, 11 Nov 2006 15:43:00 +0000 Subject: [PATCH 2/5] Update to 4.3.99.2 --- .cvsignore | 2 +- sources | 2 +- xfce4-dev-tools.spec | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 3261105..de03f40 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xfce4-dev-tools-4.3.99.1.tar.bz2 +xfce4-dev-tools-4.3.99.2.tar.bz2 diff --git a/sources b/sources index db5addc..d39f24e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dc6403caf82edfb896eb3878385b439a xfce4-dev-tools-4.3.99.1.tar.bz2 +6f79a59eb7ed5a9a5e8ebef253a704f8 xfce4-dev-tools-4.3.99.2.tar.bz2 diff --git a/xfce4-dev-tools.spec b/xfce4-dev-tools.spec index a0e5e81..299fb74 100644 --- a/xfce4-dev-tools.spec +++ b/xfce4-dev-tools.spec @@ -1,6 +1,6 @@ Name: xfce4-dev-tools -Version: 4.3.99.1 -Release: 3%{?dist} +Version: 4.3.99.2 +Release: 1%{?dist} Summary: Xfce developer tools Group: Development/Tools @@ -42,6 +42,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/aclocal/* %changelog +* Sat Nov 11 2006 Christoph Wickert - 4.3.99.2-1 +- Update to 4.3.99.2. + * Tue Oct 03 2006 Christoph Wickert - 4.3.99.1-3 - Require gettext-devel. - Install m4 macros also to /usr/share/aclocal. From 509487345ef13f950e8ce6a1211babcc80d5879f Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Sat, 27 Jan 2007 20:08:36 +0000 Subject: [PATCH 3/5] update to 4.4.0 --- .cvsignore | 2 +- sources | 2 +- xfce4-dev-tools.spec | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index de03f40..853b6e9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xfce4-dev-tools-4.3.99.2.tar.bz2 +xfce4-dev-tools-4.4.0.tar.bz2 diff --git a/sources b/sources index d39f24e..95e3de7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6f79a59eb7ed5a9a5e8ebef253a704f8 xfce4-dev-tools-4.3.99.2.tar.bz2 +db31d1ad47a96ebb7c8b69e0ee38f336 xfce4-dev-tools-4.4.0.tar.bz2 diff --git a/xfce4-dev-tools.spec b/xfce4-dev-tools.spec index 299fb74..a4ca08a 100644 --- a/xfce4-dev-tools.spec +++ b/xfce4-dev-tools.spec @@ -1,5 +1,5 @@ Name: xfce4-dev-tools -Version: 4.3.99.2 +Version: 4.4.0 Release: 1%{?dist} Summary: Xfce developer tools @@ -42,6 +42,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/aclocal/* %changelog +* Mon Jan 22 2007 Christoph Wickert - 4.4.0-1 +- Update to 4.4.0. + * Sat Nov 11 2006 Christoph Wickert - 4.3.99.2-1 - Update to 4.3.99.2. From d03375a923b5aca7eaa2e04fb796cf87577689bc Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:31:09 +0000 Subject: [PATCH 4/5] 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 71f3684..3f2c0bd 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := xfce4-dev-tools 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 1fb1c65b7019d657621ad5db467741074c65738a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:43:54 +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 3f2c0bd..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xfce4-dev-tools -# $Id$ -NAME := xfce4-dev-tools -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 d5b6362..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -FC-6