From 4bbe1b779917ab35d24402273c95ad99711d05b9 Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating@fedoraproject.org>
Date: Wed, 15 Apr 2009 06:17:09 +0000
Subject: [PATCH 1/4] Initialize branch F-11 for setuptool

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

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

From b97bded30cda21142b857f066be0a4b8fb04f8f4 Mon Sep 17 00:00:00 2001
From: Michal Hlavinka <mhlavink@fedoraproject.org>
Date: Tue, 4 Aug 2009 06:59:30 +0000
Subject: [PATCH 2/4] updated to 1.19.6

---
 .cvsignore     |  2 +-
 setuptool.spec | 10 +++++++---
 sources        |  2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index ad48297..f53fa5e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-setuptool-1.19.5.tar.gz
+setuptool-1.19.6.tar.gz
diff --git a/setuptool.spec b/setuptool.spec
index 8a06e80..e9debd1 100644
--- a/setuptool.spec
+++ b/setuptool.spec
@@ -1,6 +1,6 @@
 Name: setuptool
-Version: 1.19.5
-Release: 2%{?dist}
+Version: 1.19.6
+Release: 1%{?dist}
 Summary: A text mode system configuration tool
 License: GPLv2+
 Group: Applications/System
@@ -16,7 +16,7 @@ to access all of the text mode configuration programs included in the
 operating system distribution.
 
 %prep
-%setup -q
+%setup -q -n %{name}
 
 %build
 ./autogen.sh
@@ -44,6 +44,10 @@ rm -rf $RPM_BUILD_ROOT
 %config %{_sysconfdir}/setuptool.d/*
 
 %changelog
+* Tue Aug 04 2009 Michal Hlavinka <mhlavink@redhat.com> - 1.19.6-1
+- updated to 1.19.6
+- don't display *_IN locale in /dev/tty/X it does not work (#511193)
+
 * Mon Mar 09 2009 Michal Hlavinka <mhlavink@redhat.com> - 1.19.5-2
 - fix buildrequires
 
diff --git a/sources b/sources
index 025013a..7119dd3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4880d27fbb76e8cf723d220683b9957a  setuptool-1.19.5.tar.gz
+c346b838fd8960fff308b5a629fc3a27  setuptool-1.19.6.tar.gz

From a4b42f03a3190096741550060fd1998b60745698 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Thu, 26 Nov 2009 01:39:02 +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 f3e1e50..d6da125 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 # Makefile for source rpm: setuptool
-# $Id: Makefile,v 1.1 2004/09/09 12:17:16 cvsdist Exp $
+# $Id: Makefile,v 1.2 2007/10/15 19:22:50 notting Exp $
 NAME := setuptool
 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 fc492e8d782283df35db636319561cb111294312 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
Date: Thu, 29 Jul 2010 12:40:21 +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 d6da125..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: setuptool
-# $Id: Makefile,v 1.2 2007/10/15 19:22:50 notting Exp $
-NAME := setuptool
-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 25c7708..0000000
--- a/branch
+++ /dev/null
@@ -1 +0,0 @@
-F-11