Accepting request 163916 from devel:libraries:c_c++

Fix build in Factory - Apply GSF patch only conditionally, to not break others (forwarded request 163915 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/163916
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wv?expand=0&rev=16

wv-gsf.patch

@@ -0,0 +1,20 @@
+Index: wv-1.2.2/wvSummary.c
+===================================================================
+--- wv-1.2.2.orig/wvSummary.c
++++ wv-1.2.2/wvSummary.c
+@@ -25,14 +25,7 @@
+ #include <stdio.h>
+ #include "wv.h"
+ 
+-#include <gsf/gsf-input-stdio.h>
+-#include <gsf/gsf-input-memory.h>
+-#include <gsf/gsf-utils.h>
+-#include <gsf/gsf-infile.h>
+-#include <gsf/gsf-infile-msole.h>
+-#include <gsf/gsf-msole-utils.h>
+-#include <gsf/gsf-docprop-vector.h>
+-#include <gsf/gsf-meta-names.h>
++#include <gsf/gsf.h>
+ 
+ #include <stdio.h>
+ #include <stdlib.h>

wv-strcasecmp.patch

@@ -0,0 +1,12 @@
+Index: wv-1.2.2/wvWare.c
+===================================================================
+--- wv-1.2.2.orig/wvWare.c
++++ wv-1.2.2/wvWare.c
+@@ -25,6 +25,7 @@
+ #include <stdio.h>
+ #include <errno.h>
+ #include <string.h>
++#include <strings.h>
+ #include <unistd.h>
+ #include "wv.h"
+ #include "getopt.h"

wv.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sat Apr 13 20:30:43 UTC 2013 - dimstar@opensuse.org
+
+- Add wv-strcasecmp.patch: Fix build in Factory: strcasecmp is
+  declared in strings.h.
+- Add wv-gsf.patch: only include gsf.h: we don't want/need to know
+  in which header which symbold is declared.
+
 -------------------------------------------------------------------
 Tue Nov 22 15:34:06 UTC 2011 - jengelh@medozas.de
 

wv.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package wv
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,22 +16,29 @@
 #
 
 
-
 Name:           wv
 %define lname	libwv-1_2-1
-BuildRequires:  glib2-devel libgsf-devel libtiff-devel libtool libwmf-devel libxml2-devel pkgconfig
+BuildRequires:  glib2-devel
+BuildRequires:  libgsf-devel
+BuildRequires:  libtiff-devel
+BuildRequires:  libtool
+BuildRequires:  libwmf-devel
+BuildRequires:  libxml2-devel
+BuildRequires:  pkgconfig
+Version:        1.2.2
+Release:        0
+Summary:        Tools for Importing Microsoft Word (tm) Documents
 License:        GPL-2.0+
 Group:          Productivity/Publishing/Word
-Version:        1.2.2
+Url:            http://wvWare.sourceforge.net/
-Release:        216
-Summary:        Tools for Importing Microsoft Word (tm) Documents
-URL:            http://wvWare.sourceforge.net/
 Source:         wv-%{version}.tar.gz
 Patch:          wv-1.2.2-automake.patch
 Patch5:         wv-1.0.3-wvText.patch
 Patch7:         wv-1.0.3-pc.patch
 Patch8:         wv-1.2.2-overflow.patch
 Patch9:         %{name}-1.2.2-fiximplicit.patch
+Patch10:        wv-strcasecmp.patch
+Patch11:        wv-gsf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       w3m
 
@@ -54,7 +61,9 @@ Group:          System/Libraries
 libwv can parse the Microsoft Word 8 binary file format (Office97).
 
 %package devel
-Requires:       %lname = %version, libgsf-devel libwmf-devel
+Requires:       %lname = %version
+Requires:       libgsf-devel
+Requires:       libwmf-devel
 Summary:        Static Libraries and Header Files for wv
 Group:          Development/Libraries/C and C++
 
@@ -74,13 +83,17 @@ Authors:
 %patch7
 %patch8
 %patch9 -p1
+%patch10 -p1
+%if 0%{?suse_version} > 1230
+%patch11 -p1
+%endif
 
 %build
 autoreconf -f -i --verbose
 %define warn_flags -Wall -Wstrict-prototypes -Wpointer-arith -Wformat -Wformat-security
 CFLAGS="$RPM_OPT_FLAGS %{warn_flags} -fno-strict-aliasing -fstack-protector" \
 %configure --with-libwmf --with-expat --disable-dependency-tracking --disable-static --with-pic
-%{__make} %{?jobs:-j%jobs}
+make %{?_smp_mflags}
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT manonedir=%{_mandir}/man1 install