From a4008fe493d2df4c2b1d46aafe274dc9ca9fb0f6 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Fri, 18 May 2007 11:48:36 +0000
Subject: [PATCH 1/4] Initialize branch F-7 for xosd

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

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

From 7222ab834763e7c3311cba7a05c0eb5b0105eeb0 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@fedoraproject.org>
Date: Mon, 27 Aug 2007 04:19:49 +0000
Subject: [PATCH 2/4] Update License tag

---
 xosd.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/xosd.spec b/xosd.spec
index 037c4d5..62fcd8e 100644
--- a/xosd.spec
+++ b/xosd.spec
@@ -4,11 +4,11 @@
 
 Name:           xosd
 Version:        2.2.14
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        On-screen display library for X
 
 Group:          System Environment/Libraries
-License:        GPL
+License:        GPLv2+
 URL:            http://www.ignavus.net/software.html
 Source:         http://ftp.debian.org/debian/pool/main/x/xosd/%{name}_%{version}.orig.tar.gz
 Patch0:         %{name}-aclocal18.patch
@@ -110,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT
 %{xmms_plugdir}/libxmms_osd.so
 
 %changelog
+* Sun Aug 26 2007 Kevin Fenzi <kevin@tummy.com> - 2.2.14-10
+- Update License tag
+
 * Tue Feb 27 2007 Kevin Fenzi <kevin@tummy.com> - 2.2.14-9
 - Remove bmp subpackage, as bmp is no longer shipped. 
 

From 128584d9018e02a5e448a758cfef0de66446d71b Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Thu, 26 Nov 2009 01:38:26 +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 c5cea9f..0b12109 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ NAME := xosd
 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 b67f90aa16c07e89b46d87791faa8d3c144f34b2 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
Date: Thu, 29 Jul 2010 16:09:01 +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 0b12109..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: xosd
-# $Id$
-NAME := xosd
-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 c48525c..0000000
--- a/branch
+++ /dev/null
@@ -1 +0,0 @@
-F-7