From 80b0c30cbe082ceec49e8879feac2173b70b6d06 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Thu, 26 Nov 2009 01:24:01 +0000
Subject: [PATCH 1/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 22ca719..64c8af2 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ NAME := aalib
 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 921da17c7a370de2dacc95914e9c73a40b39713c Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <ausil@fedoraproject.org>
Date: Sat, 8 May 2010 01:42:21 +0000
Subject: [PATCH 2/4] Initialize branch EL-6 for aalib

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

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

From 1be996e0ba636572d4261e74e15af136f6522b36 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
Date: Wed, 28 Jul 2010 09:30:04 +0000
Subject: [PATCH 3/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 64c8af2..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: aalib
-# $Id$
-NAME := aalib
-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 46381b9..0000000
--- a/branch
+++ /dev/null
@@ -1 +0,0 @@
-EL-6

From 8424fa4c2649c16472ec5ab3184eb578349501d7 Mon Sep 17 00:00:00 2001
From: Ken Dreyer <ktdreyer@ktdreyer.com>
Date: Thu, 14 Jul 2011 17:37:47 -0600
Subject: [PATCH 4/4] Bump %{?dist} for Koji for el6

---
 aalib.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/aalib.spec b/aalib.spec
index 4519dda..b73745a 100644
--- a/aalib.spec
+++ b/aalib.spec
@@ -3,7 +3,7 @@
 Summary:        ASCII art library
 Name:           aalib
 Version:        1.4.0
-Release:        0.18.%{rc_subver}%{?dist}
+Release:        0.18.%{rc_subver}%{?dist}.1
 License:        LGPLv2+
 Group:          System Environment/Libraries
 URL:            http://aa-project.sourceforge.net/aalib/
@@ -111,6 +111,9 @@ fi
 %{_datadir}/aclocal/aalib.m4
 
 %changelog
+* Thu Jul 14 2011 Ken Dreyer <ktdreyer@ktdreyer.com> - 1.4.0-0.18.rc5.el6.1
+- Bump %%{?dist} for Koji for el6
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.0-0.18.rc5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild