From e22898d93b66a7fceb4c525260c41bf3545cf8ac Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@fedoraproject.org>
Date: Mon, 5 May 2008 21:56:36 +0000
Subject: [PATCH 1/4] Initialize branch EL-4 for cowsay

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

diff --git a/branch b/branch
new file mode 100644
index 0000000..6ec5cef
--- /dev/null
+++ b/branch
@@ -0,0 +1 @@
+EL-4

From adfdfff9eeb21cf5094ac552894ae4941c6c6b47 Mon Sep 17 00:00:00 2001
From: Jon Stanley <jstanley@fedoraproject.org>
Date: Fri, 23 May 2008 14:04:19 +0000
Subject: [PATCH 2/4] fixed license tag

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

diff --git a/cowsay.spec b/cowsay.spec
index 3956811..b1452a2 100644
--- a/cowsay.spec
+++ b/cowsay.spec
@@ -1,9 +1,9 @@
 Name:           cowsay
 Version:        3.03
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Configurable speaking/thinking cow
 Group:          Amusements/Games
-License:        Artistic or GPL
+License:        Artistic or GPLv2+
 URL:            http://www.nog.net/~tony/warez/cowsay.shtml
 Source0:        http://www.nog.net/~tony/warez/%{name}-%{version}.tar.gz
 Source1:        cowsay.bashcomp
@@ -63,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/bash_completion.d
 
 %changelog
+* Fri May 23 2008 Jon Stanley <jonstanley@gmail.com> - 3.03-5
+- Fix license tag
+
 * Tue Oct 09 2007 Michał Bentkowski <mr.ecik at gmail.com> - 3.03-4
 - Fix mech-and-cow file (#250844)
 

From cfb5e5b2872952e91f60082d7156e2a95cdc56fd Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Thu, 26 Nov 2009 01:33:22 +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 e6cf47f..99ecd5e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 # Makefile for source rpm: cowsay
-# $Id$
+# $Id: Makefile,v 1.1 2007/01/02 19:04:42 ecik Exp $
 NAME := cowsay
 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 42b2a229150316e9bfb0a5ec03a8afb37398d8fd Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
Date: Wed, 28 Jul 2010 12:12:55 +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 99ecd5e..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: cowsay
-# $Id: Makefile,v 1.1 2007/01/02 19:04:42 ecik Exp $
-NAME := cowsay
-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 6ec5cef..0000000
--- a/branch
+++ /dev/null
@@ -1 +0,0 @@
-EL-4