From 28bc406029a8b24732651068684f4a083f53c073 Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating@fedoraproject.org>
Date: Wed, 15 Apr 2009 06:04:31 +0000
Subject: [PATCH 1/4] Initialize branch F-11 for xfconf

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

diff --git a/branch b/branch
new file mode 100644
index 0000000..25c7708
--- /dev/null
+++ b/branch
@@ -0,0 +1 @@
+F-11

From 81f33d133d2dad16ca9060075427cf9123e6c28f Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@fedoraproject.org>
Date: Mon, 20 Apr 2009 17:48:05 +0000
Subject: [PATCH 2/4] Update to 4.6.1

---
 .cvsignore  | 2 +-
 sources     | 2 +-
 xfconf.spec | 7 +++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 186324e..511d5a0 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-xfconf-4.6.0.tar.bz2
+xfconf-4.6.1.tar.bz2
diff --git a/sources b/sources
index f1d50a4..3b4f484 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-38595f78379eb1f456e97b393fdafd20  xfconf-4.6.0.tar.bz2
+d4d3018767ea9eb4b57cc57d4038023b  xfconf-4.6.1.tar.bz2
diff --git a/xfconf.spec b/xfconf.spec
index 15434e5..44fdbe8 100644
--- a/xfconf.spec
+++ b/xfconf.spec
@@ -1,6 +1,6 @@
 Name:           xfconf
-Version:        4.6.0
-Release:        2%{?dist}
+Version:        4.6.1
+Release:        1%{?dist}
 Summary:        Hierarchical configuration system for Xfce
 
 Group:          System Environment/Base
@@ -111,6 +111,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sun Apr 19 2009 Kevin Fenzi <kevin@tummy.com> - 4.6.1-1
+- Update to 4.6.1
+
 * Mon Mar 02 2009 Christoph Wickert <cwickert@fedoraproject.org> - 4.6.0-2
 - Fix directory ownership problems
 - Move gtk-doc into devel package and mark it %%doc

From 6aa2ed6b3f58965243ca36202bf5cfff82e0ac82 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Thu, 26 Nov 2009 01:32:44 +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 fd79ce4..d8d6bd4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 # Makefile for source rpm: xfconf
-# $Id$
+# $Id: Makefile,v 1.1 2009/01/11 16:58:13 kevin Exp $
 NAME := xfconf
 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 a507240ad542162004ee5074ff5d00de9cb0ce51 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
Date: Thu, 29 Jul 2010 15:49:34 +0000
Subject: [PATCH 4/4] dist-git conversion

---
 .cvsignore => .gitignore |  0
 Makefile                 | 21 ---------------------
 branch                   |  1 -
 import.log               |  1 -
 4 files changed, 23 deletions(-)
 rename .cvsignore => .gitignore (100%)
 delete mode 100644 Makefile
 delete mode 100644 branch
 delete mode 100644 import.log

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 d8d6bd4..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: xfconf
-# $Id: Makefile,v 1.1 2009/01/11 16:58:13 kevin Exp $
-NAME := xfconf
-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 25c7708..0000000
--- a/branch
+++ /dev/null
@@ -1 +0,0 @@
-F-11
diff --git a/import.log b/import.log
deleted file mode 100644
index 63166e1..0000000
--- a/import.log
+++ /dev/null
@@ -1 +0,0 @@
-xfconf-4_5_92-4_fc11:HEAD:xfconf-4.5.92-4.fc11.src.rpm:1231811349