From d1bbcab0180706c931550d857afda98cbc99b269 Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating@fedoraproject.org>
Date: Sat, 20 Oct 2007 19:05:51 +0000
Subject: [PATCH 1/4] Initialize branch F-8 for wv2

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

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

From 89962271fe0b0c51c4bccc00b5eb8b57880eae32 Mon Sep 17 00:00:00 2001
From: Andreas Bierfert <awjb@fedoraproject.org>
Date: Thu, 3 Jan 2008 23:35:39 +0000
Subject: [PATCH 2/4] - fix #343451 multilib

---
 wv2-fixmultilib.patch | 17 +++++++++++++++++
 wv2.spec              | 11 +++++++++--
 2 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 wv2-fixmultilib.patch

diff --git a/wv2-fixmultilib.patch b/wv2-fixmultilib.patch
new file mode 100644
index 0000000..de1e932
--- /dev/null
+++ b/wv2-fixmultilib.patch
@@ -0,0 +1,17 @@
+--- wv2-config.in.orig	2008-01-04 00:28:42.000000000 +0100
++++ wv2-config.in	2008-01-04 00:30:43.000000000 +0100
+@@ -87,7 +87,6 @@
+ fi
+ 
+ if test "$echo_libs" = "yes"; then
+-	libdirs=-L@libdir@
+ 	my_wv2_libs=
+ 	for i in $wv2_libs ; do
+ 		if test "x$i" != "x-L@libdir@" ; then
+@@ -99,5 +98,5 @@
+ 		fi
+ 	done
+ 
+-	echo $libdirs $my_wv2_libs
++	echo $my_wv2_libs
+ fi      
diff --git a/wv2.spec b/wv2.spec
index 90cfc1d..7718a97 100644
--- a/wv2.spec
+++ b/wv2.spec
@@ -1,6 +1,6 @@
 Name:           wv2
 Version:        0.2.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A library which allows access to Microsoft® Word files
 
 Group:          System Environment/Libraries
@@ -11,6 +11,8 @@ Source0:        http://dl.sf.net/wvware/wv2-0.2.3.tar.bz2
 Patch1:         wv2-0.2.2-no-undefined.patch
 # see bug #192291
 Patch2:         wv2-0.2.2-no-extra-libs.patch
+# see bug #343451 
+Patch3:         wv2-fixmultilib.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -44,7 +46,7 @@ The wv2-devel package includes the header files necessary for developing.
 
 %patch1 -p1 -b .no-undefined
 %patch2 -p1 -b .extra_libs
-
+%patch3
 ./autogen.sh
 
 %build
@@ -58,6 +60,8 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
 
+touch -r ChangeLog $RPM_BUILD_ROOT/%{_bindir}/wv2-config
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -78,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/wv2
 
 %changelog
+* Fri Jan 04 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.2.3-4
+- fix #343451 multiarch
+
 * Thu Aug 23 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.2.3-3
 - new license tag
 - rebuild for buildid

From 3320cf0f6c1cc10173f857d22e8fc485542a0e28 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Thu, 26 Nov 2009 01:19:15 +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 9387543..106a103 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 # Makefile for source rpm: wv2
-# $Id$
+# $Id: Makefile,v 1.1 2005/07/01 22:37:08 awjb Exp $
 NAME := wv2
 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 a09f0347986d10d54ea67d9188075830b0f40cb1 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
Date: Thu, 29 Jul 2010 15:27:43 +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 106a103..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: wv2
-# $Id: Makefile,v 1.1 2005/07/01 22:37:08 awjb Exp $
-NAME := wv2
-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 e9e7ccd..0000000
--- a/branch
+++ /dev/null
@@ -1 +0,0 @@
-F-8