From 12d72948d9ec37eb05b70926c75d804c4e6aacf5 Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating@fedoraproject.org>
Date: Sun, 21 Oct 2007 01:01:53 +0000
Subject: [PATCH 1/4] Initialize branch F-8 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..e9e7ccd
--- /dev/null
+++ b/branch
@@ -0,0 +1 @@
+F-8

From 2cdbe2f51c72d7cfb25bf3cb2f41698519ba4aad Mon Sep 17 00:00:00 2001
From: Deji Akingunola <deji@fedoraproject.org>
Date: Fri, 7 Mar 2008 05:01:14 +0000
Subject: [PATCH 2/4] - New release 1.1.4

---
 .cvsignore    |  2 +-
 sources       |  2 +-
 xcompmgr.spec | 35 +++++++++++++++++++----------------
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 438f821..be1bad0 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-xcompmgr-1.1.3.tar.gz
+xcompmgr-1.1.4.tar.bz2
diff --git a/sources b/sources
index 9775461..6516288 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-44ccbafa8484b7e0c00e5c83cd915adc  xcompmgr-1.1.3.tar.gz
+3eb1c2b7a6ceaec4ee872cb06d202d91  xcompmgr-1.1.4.tar.bz2
diff --git a/xcompmgr.spec b/xcompmgr.spec
index 854c903..7fc7c7c 100644
--- a/xcompmgr.spec
+++ b/xcompmgr.spec
@@ -1,19 +1,19 @@
-Summary: X11 composite manager
-Name: xcompmgr
-Version: 1.1.3
-Release: 7%{?dist}
-License: Copyright only
-Group: User Interface/X
-URL: http://xapps.freedesktop.org
-Source0: http://xapps.freedesktop.org/release/%{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libX11-devel
-BuildRequires: libXfixes-devel
-BuildRequires: libXrender-devel
-BuildRequires: libXdamage-devel
-BuildRequires: libXcomposite-devel
-BuildRequires: libXext-devel
-BuildRequires: pkgconfig
+Summary:	X11 composite manager
+Name:		xcompmgr
+Version:	1.1.4
+Release:	1%{?dist}
+License:	Copyright only
+Group:		User Interface/X
+URL:		http://xapps.freedesktop.org
+Source0:	http://xorg.freedesktop.org/archive/individual/app/%{name}-%{version}.tar.bz2
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	libX11-devel
+BuildRequires:	libXfixes-devel
+BuildRequires:	libXrender-devel
+BuildRequires:	libXdamage-devel
+BuildRequires:	libXcomposite-devel
+BuildRequires:	libXext-devel
+BuildRequires:	pkgconfig
 
 %description
 xcompmgr is a sample compositing manager for X servers supporting the XFIXES,
@@ -40,6 +40,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/xcompmgr.1.gz
 
 %changelog
+* Thu Mar 06 2008 Deji Akingunola <dakingun@gmail.com> - 1.1.4-1
+- New release 1.1.4
+
 * Wed Aug 22 2007 Deji Akingunola <dakingun@gmail.com> - 1.1.3-7
 - Update License tag and Rebuild
 

From c002f1160321759b868da1319ae9bcdb93133580 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 6301d58e29b5d146a304ffda5defbeaa7d187196 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
Date: Thu, 29 Jul 2010 15:36:32 +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 e9e7ccd..0000000
--- a/branch
+++ /dev/null
@@ -1 +0,0 @@
-F-8