From 315e80fb3e359851f5b5b8b75ea598982bc41640 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Thu, 26 Nov 2009 01:51:58 +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 ada8cae..4eddbae 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ NAME := python-html2text
 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 0d575b0ef9544ae9bf7e6a4c01fd2f6bee81206a Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <ausil@fedoraproject.org>
Date: Sat, 8 May 2010 02:18:08 +0000
Subject: [PATCH 2/4] Initialize branch EL-6 for python-html2text

---
 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 bde0d6e2525edc053fcb353d90dd8776d1eee266 Mon Sep 17 00:00:00 2001
From: Thorsten Leemhuis <thl@fedoraproject.org>
Date: Sun, 4 Jul 2010 16:18:26 +0000
Subject: [PATCH 3/4] - update to 2.38

---
 .cvsignore            | 2 +-
 python-html2text.spec | 7 +++++--
 sources               | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index e714550..dabcc92 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-html2text-2.35.py
+html2text-2.38.py
diff --git a/python-html2text.spec b/python-html2text.spec
index 9fc5f16..5afbf85 100644
--- a/python-html2text.spec
+++ b/python-html2text.spec
@@ -2,8 +2,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-html2text
-Version:        2.35
-Release:        3.1
+Version:        2.38
+Release:        1%{dist}
 Summary:        Converts a page of HTML into clean, easy-to-read plain ASCII text
 
 Group:          Development/Languages
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Jul 04 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.38-1
+- update to 2.38
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.35-3.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index 508584e..052c248 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e26ce1a77e07393bc3a9bbbf47a4f6a2  html2text-2.35.py
+11ca33eabefb6a951ff7ae667f441f19  html2text-2.38.py

From 416e6ea30943adac48705834110d3554551cc487 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
Date: Thu, 29 Jul 2010 10:23:23 +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 4eddbae..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: python-html2text
-# $Id$
-NAME := python-html2text
-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