From 81ce1192ee2ee591fe8fd89e44674b82e1dbd6d7c03c36aa2d1bf87c27c14803 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 28 Jan 2012 23:08:16 +0000 Subject: [PATCH 1/2] Use %_smp_mflags for parallel build OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/wv?expand=0&rev=11 --- wv.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wv.spec b/wv.spec index b948533..f3ddc56 100644 --- a/wv.spec +++ b/wv.spec @@ -1,7 +1,7 @@ # # spec file for package wv # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -25,7 +25,7 @@ Group: Productivity/Publishing/Word Version: 1.2.2 Release: 216 Summary: Tools for Importing Microsoft Word (tm) Documents -URL: http://wvWare.sourceforge.net/ +Url: http://wvWare.sourceforge.net/ Source: wv-%{version}.tar.gz Patch: wv-1.2.2-automake.patch Patch5: wv-1.0.3-wvText.patch @@ -80,7 +80,7 @@ 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 From a4a7bb9084b4f521a1a62670afadfcc8b20fa259ad956dfbedc090d4f033a8d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Sat, 13 Apr 2013 21:25:48 +0000 Subject: [PATCH 2/2] Accepting request 163915 from home:dimstar:branches:devel:libraries:c_c++ Fix build in Factory - Apply GSF patch only conditionally, to not break others OBS-URL: https://build.opensuse.org/request/show/163915 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/wv?expand=0&rev=12 --- wv-gsf.patch | 20 ++++++++++++++++++++ wv-strcasecmp.patch | 12 ++++++++++++ wv.changes | 8 ++++++++ wv.spec | 27 ++++++++++++++++++++------- 4 files changed, 60 insertions(+), 7 deletions(-) create mode 100644 wv-gsf.patch create mode 100644 wv-strcasecmp.patch diff --git a/wv-gsf.patch b/wv-gsf.patch new file mode 100644 index 0000000..689389b --- /dev/null +++ b/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 + #include "wv.h" + +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include ++#include + + #include + #include diff --git a/wv-strcasecmp.patch b/wv-strcasecmp.patch new file mode 100644 index 0000000..2fe0f2a --- /dev/null +++ b/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 + #include + #include ++#include + #include + #include "wv.h" + #include "getopt.h" diff --git a/wv.changes b/wv.changes index 2756d87..c1ce8f9 100644 --- a/wv.changes +++ b/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 diff --git a/wv.spec b/wv.spec index f3ddc56..d30146d 100644 --- a/wv.spec +++ b/wv.spec @@ -1,7 +1,7 @@ # # spec file for package wv # -# Copyright (c) 2012 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,15 +16,20 @@ # - 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 -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 @@ -32,6 +37,8 @@ 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,6 +83,10 @@ Authors: %patch7 %patch8 %patch9 -p1 +%patch10 -p1 +%if 0%{?suse_version} > 1230 +%patch11 -p1 +%endif %build autoreconf -f -i --verbose