From c15f3e3c844b917ed01161511e92129d18b92627 Mon Sep 17 00:00:00 2001
From: Aurelien Bompard <abompard@fedoraproject.org>
Date: May 15 2005 15:30:18 +0000
Subject: - new version


---

diff --git a/.cvsignore b/.cvsignore
index ac3e542..b6ff76d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-wv-1.0.0.tar.gz
+wv-1.0.3.tar.gz
diff --git a/sources b/sources
index af901f9..2227655 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5e9675a8676cb1c1f6b8ab05af883178  wv-1.0.0.tar.gz
+71e42aa9af1e03cc8c608bbbdcb43af8  wv-1.0.3.tar.gz
diff --git a/wv-1.0.3-gcc4.patch b/wv-1.0.3-gcc4.patch
new file mode 100644
index 0000000..21b48ff
--- /dev/null
+++ b/wv-1.0.3-gcc4.patch
@@ -0,0 +1,40 @@
+--- wv-1.0.0/wvConfig.c.gcc4        2005-05-08 23:17:35.000000000 -0400
++++ wv-1.0.0/wvConfig.c        2005-05-08 23:18:42.000000000 -0400
+@@ -2130,7 +2130,7 @@
+ }
+ 
+ static void
+-startElement (void *userData, const XML_Char *name, const XML_Char **atts)
++wvStartElement (void *userData, const XML_Char *name, const XML_Char **atts)
+ {
+     unsigned int nAtts = 0;
+     const XML_Char **p;
+@@ -3094,7 +3094,7 @@
+ }
+ 
+ static void
+-endElement (void *userData, const XML_Char *name)
++wvEndElement (void *userData, const XML_Char *name)
+ {
+     state_data *mydata = (state_data *) userData;
+     unsigned int token_type;
+@@ -3470,8 +3470,8 @@
+ 	memset(&hdl, 0, sizeof(hdl));
+ 
+ 	hdl.getEntity = _getEntity;
+-	hdl.startElement = startElement;
+-	hdl.endElement = endElement;
++	hdl.startElement = wvStartElement;
++	hdl.endElement = wvEndElement;
+ 	hdl.characters = charData;
+ 
+ 	if (myhandle->fp)
+@@ -3514,7 +3514,7 @@
+     size_t len;
+ 
+     XML_SetUserData (parser, myhandle);
+-    XML_SetElementHandler (parser, startElement, endElement);
++    XML_SetElementHandler (parser, wvStartElement, wvEndElement);
+     XML_SetCharacterDataHandler (parser, charData);
+ 
+     if (myhandle->fp == NULL)
diff --git a/wv-1.0.3-oledecod.patch b/wv-1.0.3-oledecod.patch
new file mode 100644
index 0000000..f2e043d
--- /dev/null
+++ b/wv-1.0.3-oledecod.patch
@@ -0,0 +1,11 @@
+--- wv-1.0.3/exporter/support.c.oledecod	2005-05-08 22:50:23.000000000 +0200
++++ wv-1.0.3/exporter/support.c	2005-05-08 22:50:53.000000000 +0200
+@@ -10,7 +10,7 @@
+ #endif
+ #include "config.h"
+ #include "wv.h"
+-#include "oledecod.h"
++#include "ms-ole.h"
+ 
+ #include "wvexporter-priv.h"
+ 
diff --git a/wv.spec b/wv.spec
index 25a510a..d63b18c 100644
--- a/wv.spec
+++ b/wv.spec
@@ -1,17 +1,14 @@
 Name:       wv
 Summary:    MSWord 6/7/8/9 binary file format to HTML converter
-Version:    1.0.0
-Release:    5
+Version:    1.0.3
+Release:    1%{?dist}
 License:    GPL
 Group:      Applications/Text
 URL:        http://wvware.sourceforge.net
-Source:     http://dl.sf.net/wvware/wv-1.0.0.tar.gz
+Source:     http://dl.sf.net/wvware/wv-1.0.3.tar.gz
 Patch0:     wv-wvtext-tmp.patch
-Patch1:     wv-wvdvi-copy.patch
-Patch2:     wv-docbook-filename.patch
-# patch3: deal with filenames containing spaces
-Patch3:     wv-wvmime-tmp-filename.patch
-Patch4:     wv-field.c.patch
+Patch1:     wv-1.0.3-oledecod.patch
+Patch2:     wv-1.0.3-gcc4.patch
 Patch5:     wv-1.0.0-rhbug150461.patch
 
 #BuildRequires: XFree86-devel
@@ -33,11 +30,9 @@ documents into HTML, which can then be read with a browser.
 
 %prep
 %setup -q
-%patch0
-%patch1
-%patch2
-%patch3
-%patch4
+#%patch0
+%patch1 -p1 -b .oledecod
+%patch2 -p1 -b .gcc4
 %patch5 -p1 -b .printf-rhbug150461
 
 
@@ -52,7 +47,6 @@ rm -rf $RPM_BUILD_ROOT
 %makeinstall
 
 #ln -sf wvConvert $RPM_BUILD_ROOT/%{_bindir}/wvText
-mv $RPM_BUILD_ROOT%{_prefix}/man $RPM_BUILD_ROOT%{_datadir}
 find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -exec rm -f {} \;
 
 %clean
@@ -75,6 +69,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun May 15 2005 Aurelien Bompard <gauret[AT]free.fr> 1.0.3-1%{?dist}
+- new version
+- fix build with gcc4
+- use dist tag
+
 * Tue May 10 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.0-5
 - Include printf format fix for bug 150461.