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

---
 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 7cb045f0a6d1d77bc48f5bfe03f9f3435cab3de5 Mon Sep 17 00:00:00 2001
From: Deji Akingunola <deji@fedoraproject.org>
Date: Tue, 3 Nov 2009 01:03:35 +0000
Subject: [PATCH 2/4] - New release 1.1.5

---
 sources       | 2 +-
 xcompmgr.spec | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/sources b/sources
index 6516288..8b703f8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3eb1c2b7a6ceaec4ee872cb06d202d91  xcompmgr-1.1.4.tar.bz2
+bf8faa8c540bfdcd0252801d8f16d868  xcompmgr-1.1.5.tar.bz2
diff --git a/xcompmgr.spec b/xcompmgr.spec
index b66fe4e..e1d3b6e 100644
--- a/xcompmgr.spec
+++ b/xcompmgr.spec
@@ -1,7 +1,7 @@
 Summary:	X11 composite manager
 Name:		xcompmgr
-Version:	1.1.4
-Release:	3%{?dist}
+Version:	1.1.5
+Release:	1%{?dist}
 License:	Copyright only
 Group:		User Interface/X
 URL:		http://xapps.freedesktop.org
@@ -35,11 +35,14 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog
+%doc ChangeLog COPYING README
 %{_bindir}/xcompmgr
 %{_mandir}/man1/xcompmgr.1.gz
 
 %changelog
+* Mon Nov 02 2009 Deji Akingunola <dakingun@gmail.com> - 1.1.5-1
+- New release 1.1.5
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 

From 14b93dee0f9e4d593e9f28b98e379da82a9f8e89 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Thu, 26 Nov 2009 01:29:56 +0000
Subject: [PATCH 3/4] 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 694566e..d8288a8 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ NAME := xcompmgr
 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 b135a342b7e1da6c300a332851d5bf83c7f24196 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
Date: Thu, 29 Jul 2010 15:36: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 d8288a8..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: xcompmgr
-# $Id$
-NAME := xcompmgr
-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