From a5ae7cfd159e8ff3b8f49c383ec1b1f4db00f74d Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating@fedoraproject.org>
Date: Tue, 29 Sep 2009 07:21:13 +0000
Subject: [PATCH 1/4] Initialize branch F-12 for xfce-utils

---
 branch | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 branch

diff --git a/branch b/branch
new file mode 100644
index 0000000..06de2d2
--- /dev/null
+++ b/branch
@@ -0,0 +1 @@
+F-12

From 6599a438171ae548aa84114157b4a0f5244264a2 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Thu, 26 Nov 2009 01:32:42 +0000
Subject: [PATCH 2/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 bcae37f..10fffb7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 # Makefile for source rpm: xfce-utils
-# $Id$
+# $Id: Makefile,v 1.1 2005/03/19 18:24:42 kevin Exp $
 NAME := xfce-utils
 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 e8daef98ea36f870e3c1fa05786ba51dc73afd5f Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@fedoraproject.org>
Date: Mon, 7 Jun 2010 03:45:41 +0000
Subject: [PATCH 3/4] Update to 4.6.2

---
 .cvsignore      | 2 +-
 sources         | 2 +-
 xfce-utils.spec | 9 ++++++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index bbf4ae9..4df4636 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-xfce-utils-4.6.1.tar.bz2
+xfce-utils-4.6.2.tar.bz2
diff --git a/sources b/sources
index 67e9c43..7192564 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1aa2362b11e79e56d52ce0d265faf1b6  xfce-utils-4.6.1.tar.bz2
+5d23407700d7e8c9751e17a5bc955109  xfce-utils-4.6.2.tar.bz2
diff --git a/xfce-utils.spec b/xfce-utils.spec
index 13f530d..685419e 100644
--- a/xfce-utils.spec
+++ b/xfce-utils.spec
@@ -2,11 +2,11 @@
 
 Summary: Utilities for the Xfce Desktop Environment
 Name: xfce-utils
-Version: 4.6.1
-Release: 2%{?dist}
+Version: 4.6.2
+Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfce-utils-%{version}.tar.bz2
+Source0: http://archive.xfce.org/src/xfce/xfce-utils/4.6/xfce-utils-%{version}.tar.bz2
 Source1: xfce4.desktop
 Patch0: xfce-utils-4.4.2-pulseaudio.patch
 Patch1: xfce-utils-4.4.3-xfterm4-bug.patch
@@ -128,6 +128,9 @@ fi
 %doc %{_datadir}/xfce4/doc/xfce-chunk.css
 
 %changelog
+* Fri May 21 2010 Kevin Fenzi <kevin@tummy.com> - 4.6.2-1
+- Update to 4.6.2
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.6.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 

From 20342617ef88fea7becabeac0873177ef311b707 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
Date: Thu, 29 Jul 2010 15:42:34 +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 10fffb7..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: xfce-utils
-# $Id: Makefile,v 1.1 2005/03/19 18:24:42 kevin Exp $
-NAME := xfce-utils
-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 06de2d2..0000000
--- a/branch
+++ /dev/null
@@ -1 +0,0 @@
-F-12