From 0e767836ec6b0e88da36ce83e78e06bb69d23681 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu@fedoraproject.org>
Date: Tue, 28 Jun 2011 11:41:45 +0200
Subject: [PATCH] Remove -Werror from CFLAGS/CXXFLAGS (Add
 libwps-0.2.0-werror.patch) (Fix FTBFS BZ#715767).

---
 libwps-0.2.0-werror.patch | 28 ++++++++++++++++++++++++++++
 libwps.spec               | 12 ++++++++++--
 2 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 libwps-0.2.0-werror.patch

diff --git a/libwps-0.2.0-werror.patch b/libwps-0.2.0-werror.patch
new file mode 100644
index 0000000..4084a75
--- /dev/null
+++ b/libwps-0.2.0-werror.patch
@@ -0,0 +1,28 @@
+diff -Naur libwps-0.2.0.orig/configure libwps-0.2.0/configure
+--- libwps-0.2.0.orig/configure	2010-11-16 11:50:59.000000000 +0100
++++ libwps-0.2.0/configure	2011-06-28 11:27:23.118458784 +0200
+@@ -15185,8 +15185,8 @@
+ 
+ else
+   if test x"$GCC" = xyes; then
+-    CFLAGS="$CFLAGS -Wall -Werror -pedantic"
+-    CXXFLAGS="$CXXFLAGS -Wall -Werror -pedantic"
++:    CFLAGS="$CFLAGS -Wall -Werror -pedantic"
++:    CXXFLAGS="$CXXFLAGS -Wall -Werror -pedantic"
+   fi
+ fi
+ 
+diff -Naur libwps-0.2.0.orig/configure.in libwps-0.2.0/configure.in
+--- libwps-0.2.0.orig/configure.in	2008-04-14 09:55:28.000000000 +0200
++++ libwps-0.2.0/configure.in	2011-06-28 11:27:42.786743535 +0200
+@@ -202,8 +202,8 @@
+   
+ else
+   if test x"$GCC" = xyes; then
+-    CFLAGS="$CFLAGS -Wall -Werror -pedantic"
+-    CXXFLAGS="$CXXFLAGS -Wall -Werror -pedantic"
++:    CFLAGS="$CFLAGS -Wall -Werror -pedantic"
++:    CXXFLAGS="$CXXFLAGS -Wall -Werror -pedantic"
+   fi
+ fi
+ 
diff --git a/libwps.spec b/libwps.spec
index 8f8641d..9dbd9e1 100644
--- a/libwps.spec
+++ b/libwps.spec
@@ -1,12 +1,14 @@
 Name:		libwps
 Version:	0.2.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Library for reading and converting Microsoft Works word processor documents
 
 Group:		System Environment/Libraries
 License:	LGPLv2+
 URL:		http://libwps.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+# Remove -Werror from CFLAGS/CXXFLAGS
+Patch0:		%{name}-%{version}-werror.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	doxygen
@@ -55,7 +57,9 @@ The %{name}-doc package contains documentation files for %{name}
 
 %prep
 %setup -q
-
+%patch0 -p1
+# Prevent autotools from being rerun
+touch -r aclocal.m4 configure configure.in
 
 %build
 %configure --disable-static
@@ -112,6 +116,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Jun 28 2011 Ralf Corsépius <corsepiu@fedoraproject.org> - 0.2.0-3
+- Remove -Werror from CFLAGS/CXXFLAGS (Add libwps-0.2.0-werror.patch)
+  (Fix FTBFS BZ#715767).
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild