From 9b7af4f0ae0c23e5bed530e1482ae2cc7cd69fef31a6aaa99de4c3e65e6690e4 Mon Sep 17 00:00:00 2001 From: Michal Vyskocil Date: Wed, 28 Aug 2013 08:36:09 +0000 Subject: [PATCH] Accepting request 196593 from home:elvigia:branches:devel:libraries:c_c++ - Also, cleanup buildrequires, libtiff is not used and zlib-devel is required. - wv-noansi.patch: Do not build with -ansi , but in gnu99 mode with system extensions enabled OBS-URL: https://build.opensuse.org/request/show/196593 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/wv?expand=0&rev=14 --- wv-noansi.patch | 28 ++++++++++++++++++++++++++++ wv.changes | 12 ++++++++++++ wv.spec | 5 +++-- 3 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 wv-noansi.patch diff --git a/wv-noansi.patch b/wv-noansi.patch new file mode 100644 index 0000000..5de44c2 --- /dev/null +++ b/wv-noansi.patch @@ -0,0 +1,28 @@ +--- wv-1.2.2.orig/configure.ac ++++ wv-1.2.2/configure.ac +@@ -53,9 +53,12 @@ AH_TOP([ + + dnl Checks for programs. + +-AC_PROG_CC ++AC_PROG_CC_STDC ++AC_USE_SYSTEM_EXTENSIONS ++AC_SYS_LARGEFILE ++ + if test "x$GCC" = "xyes"; then +- ANSI_CFLAGS="-ansi" ++ ANSI_CFLAGS="" + else + ANSI_CFLAGS="" + fi +--- wv-1.2.2.orig/wvWare.c ++++ wv-1.2.2/wvWare.c +@@ -30,8 +30,6 @@ + #include "wv.h" + #include "getopt.h" + +-/* strdup isn't declared in for `gcc -ansi'; declare it here */ +-extern char *strdup (const char *); + + extern char *str_copy(char *d, size_t n, char *s); + extern char *str_append(char *d, size_t n, char *s); diff --git a/wv.changes b/wv.changes index c1ce8f9..42168d9 100644 --- a/wv.changes +++ b/wv.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Wed Aug 28 02:50:03 UTC 2013 - crrodriguez@opensuse.org + +- Also, cleanup buildrequires, libtiff is not used and zlib-devel + is required. + +------------------------------------------------------------------- +Wed Aug 28 01:47:05 UTC 2013 - crrodriguez@opensuse.org + +- wv-noansi.patch: Do not build with -ansi , but in gnu99 mode with + system extensions enabled + ------------------------------------------------------------------- Sat Apr 13 20:30:43 UTC 2013 - dimstar@opensuse.org diff --git a/wv.spec b/wv.spec index d30146d..7e42696 100644 --- a/wv.spec +++ b/wv.spec @@ -20,11 +20,11 @@ Name: wv %define lname libwv-1_2-1 BuildRequires: glib2-devel BuildRequires: libgsf-devel -BuildRequires: libtiff-devel BuildRequires: libtool BuildRequires: libwmf-devel BuildRequires: libxml2-devel BuildRequires: pkgconfig +BuildRequires: zlib-devel Version: 1.2.2 Release: 0 Summary: Tools for Importing Microsoft Word (tm) Documents @@ -39,6 +39,7 @@ Patch8: wv-1.2.2-overflow.patch Patch9: %{name}-1.2.2-fiximplicit.patch Patch10: wv-strcasecmp.patch Patch11: wv-gsf.patch +Patch12: wv-noansi.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: w3m @@ -87,7 +88,7 @@ Authors: %if 0%{?suse_version} > 1230 %patch11 -p1 %endif - +%patch12 -p1 %build autoreconf -f -i --verbose %define warn_flags -Wall -Wstrict-prototypes -Wpointer-arith -Wformat -Wformat-security