From 6c668bd5f04aec7abe9c9fd56d18ba8bafa162e0 Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating@fedoraproject.org>
Date: Tue, 29 Sep 2009 08:09:14 +0000
Subject: [PATCH 1/4] Initialize branch F-12 for a2ps

---
 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 b276a0c4d753ab86abdadfe6ed44a5a5a19af43d Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Thu, 26 Nov 2009 01:23:59 +0000
Subject: [PATCH 2/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 da5b6e5..7e96f19 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 # Makefile for source rpm: a2ps
-# $Id: Makefile,v 1.1 2004/09/09 02:51:00 cvsdist Exp $
+# $Id: Makefile,v 1.2 2007/10/15 18:35:17 notting Exp $
 NAME := a2ps
 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 4507bd29bb27977e446c90f753d38ad468861569 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
Date: Wed, 28 Jul 2010 09:29:34 +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 7e96f19..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: a2ps
-# $Id: Makefile,v 1.2 2007/10/15 18:35:17 notting Exp $
-NAME := a2ps
-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),)
-# attempt 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

From b01d2f4ee6ae295fc662d10e3464d7a70f18fe5e Mon Sep 17 00:00:00 2001
From: Mark Chappell <tremble@tremble.org.uk>
Date: Wed, 8 Sep 2010 20:35:59 +0200
Subject: [PATCH 4/4] Build EL6 branch from the RHEL package
 a2ps-4.14-10.1.el6.src.rpm

---
 .gitignore | 2 ++
 a2ps.spec  | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 03aa984..df67cf9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 a2ps-4.14.tar.gz
 i18n-fonts-0.1.tar.gz
+/a2ps-4.14.tar.gz
+/i18n-fonts-0.1.tar.gz
diff --git a/a2ps.spec b/a2ps.spec
index b32e17c..43bec0d 100644
--- a/a2ps.spec
+++ b/a2ps.spec
@@ -13,7 +13,7 @@
 Summary: Converts text and other types of files to PostScript
 Name: a2ps
 Version: 4.14
-Release: 10%{?dist}
+Release: 10.1%{?dist}
 License: GPLv3+
 Group: Applications/Publishing
 Source0: http://ftp.gnu.org/gnu/a2ps/%{name}-%{version}.tar.gz
@@ -288,6 +288,10 @@ exit 0
 %{emacs_lispdir}/*.el
 
 %changelog
+* Mon Apr 26 2010 Dennis Gregorovic <dgregor@redhat.com> - 4.14-10.1
+- Rebuilt for RHEL 6
+Related: rhbz#566527
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.14-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild