From 1ab561bcbe17ad9238524d56b11ab8a24c3d1101 Mon Sep 17 00:00:00 2001
From: Jeremy Katz <katzj@fedoraproject.org>
Date: Mon, 23 Oct 2006 19:31:27 +0000
Subject: [PATCH 1/4] Initialize branch FC-6 for wv

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

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

From 093e669c0a8ab50a2d59e30fc1ffc5bfac10fab2 Mon Sep 17 00:00:00 2001
From: Aurelien Bompard <abompard@fedoraproject.org>
Date: Sat, 28 Oct 2006 08:53:39 +0000
Subject: [PATCH 2/4] update to 1.2.4, fixes #212696 (CVE-2006-4513)

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

diff --git a/.cvsignore b/.cvsignore
index 15d09ce..72169ec 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-wv-1.2.1.tar.gz
+wv-1.2.4.tar.gz
diff --git a/sources b/sources
index 6c60e23..2443358 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d757080af4595839d5d82a1a573c692c  wv-1.2.1.tar.gz
+c1861c560491f121e12917fa76970ac5  wv-1.2.4.tar.gz
diff --git a/wv.spec b/wv.spec
index bb4be51..5400313 100644
--- a/wv.spec
+++ b/wv.spec
@@ -1,11 +1,11 @@
 Name:       wv
 Summary:    MSWord 6/7/8/9 binary file format to HTML converter
-Version:    1.2.1
-Release:    7%{?dist}
+Version:    1.2.4
+Release:    1%{?dist}
 License:    GPL
 Group:      Applications/Text
 URL:        http://wvware.sourceforge.net
-Source:     http://dl.sf.net/wvware/wv-1.2.1.tar.gz
+Source:     http://dl.sf.net/wvware/wv-%{version}.tar.gz
 #Patch0:     wv-wvtext-tmp.patch
 #Patch1:     wv-1.0.3-oledecod.patch
 #Patch2:     wv-1.0.3-gcc4.patch
@@ -85,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct 28 2006 Aurelien Bompard <abompard@fedoraproject.org> 1.2.4-1
+- update to 1.2.4, fixes #212696 (CVE-2006-4513)
+
 * Fri Sep 08 2006 Aurelien Bompard <abompard@fedoraproject.org> 1.2.1-7
 - rebuild (releases 1 to 7, cvs problem)
 

From 8e7a84133b41e529f39aa0845e2eece04864d762 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Thu, 26 Nov 2009 01:19:24 +0000
Subject: [PATCH 3/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 6e1d8c7..9b85549 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ NAME := wv
 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 8e9511ad815662f9081c6c0073ec03ca7783a483 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
Date: Thu, 29 Jul 2010 15:27:41 +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 9b85549..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: wv
-# $Id$
-NAME := wv
-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 d5b6362..0000000
--- a/branch
+++ /dev/null
@@ -1 +0,0 @@
-FC-6