diff --git a/wv-1.2.2-fiximplicit.patch b/wv-1.2.2-fiximplicit.patch new file mode 100644 index 0000000..7345198 --- /dev/null +++ b/wv-1.2.2-fiximplicit.patch @@ -0,0 +1,58 @@ +Index: wv-1.2.2/decompresswmf.c +=================================================================== +--- wv-1.2.2.orig/decompresswmf.c ++++ wv-1.2.2/decompresswmf.c +@@ -17,6 +17,7 @@ + * 02111-1307, USA. + */ + ++#define _POSIX_SOURCE + #ifdef HAVE_CONFIG_H + #include "config.h" + #endif +Index: wv-1.2.2/wvRTF.c +=================================================================== +--- wv-1.2.2.orig/wvRTF.c ++++ wv-1.2.2/wvRTF.c +@@ -17,6 +17,8 @@ + * 02111-1307, USA. + */ + ++#define _BSD_SOURCE ++#define _POSIX_SOURCE + #ifdef HAVE_CONFIG_H + #include "config.h" + #endif +@@ -192,7 +194,7 @@ output_rtfUserData (rtfUserData * ud) + rtf_output_char ('{'); + + /* font color */ +- rtf_output (rtfColors[ud->cCol]); ++ rtf_output ("%s",rtfColors[ud->cCol]); + + /* font face */ + rtf_output ("\\f%d", ud->cFont); +Index: wv-1.2.2/field.c +=================================================================== +--- wv-1.2.2.orig/field.c ++++ wv-1.2.2/field.c +@@ -17,6 +17,7 @@ + * 02111-1307, USA. + */ + ++#define _BSD_SOURCE + #ifdef HAVE_CONFIG_H + #include "config.h" + #endif +Index: wv-1.2.2/wvConfig.c +=================================================================== +--- wv-1.2.2.orig/wvConfig.c ++++ wv-1.2.2/wvConfig.c +@@ -17,6 +17,7 @@ + * 02111-1307, USA. + */ + ++#define _BSD_SOURCE + #ifdef HAVE_CONFIG_H + #include "config.h" + #endif diff --git a/wv.changes b/wv.changes index 29fd1af..56e397b 100644 --- a/wv.changes +++ b/wv.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Oct 27 16:32:32 CET 2009 - meissner@suse.de + +- fixed implicit strcasecmp caused by -ansi compile switch +- removed obsoletes/provides mswordvw (unversioned obsoletes, and + also old package gone since 2000) + ------------------------------------------------------------------- Fri Jun 27 07:45:39 CEST 2008 - crrodriguez@suse.de diff --git a/wv.spec b/wv.spec index 180e22f..90c2561 100644 --- a/wv.spec +++ b/wv.spec @@ -20,13 +20,11 @@ Name: wv BuildRequires: glib2-devel libgsf-devel libtiff-devel libwmf-devel libxml2-devel pkgconfig -Obsoletes: mswordvw -Provides: mswordvw -License: GPL v2 or later; LGPL v2.1 or later +License: GPL v2 or later ; LGPL v2.1 or later Group: Productivity/Publishing/Word AutoReqProv: on Version: 1.2.2 -Release: 215 +Release: 216 Summary: Library and Tools for Importing Microsoft Word (tm) Documents Url: http://wvWare.sourceforge.net/ Source: wv-%{version}.tar.gz @@ -34,6 +32,7 @@ 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 BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: w3m @@ -51,14 +50,12 @@ Authors: %package devel License: GPL v2 or later Requires: %{name} = %{version} libgsf-devel libwmf-devel -Obsoletes: mswordvd -Provides: mswordvd Summary: Static Libraries and Header Files for wv Group: Development/Libraries/C and C++ AutoReqProv: on %description devel -Static Libraries and Header Files for wv +Static Libraries and Header Files for wv. @@ -72,6 +69,7 @@ Authors: %patch5 %patch7 %patch8 +%patch9 -p1 %build autoreconf -f -i --verbose @@ -121,136 +119,3 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/*.so %changelog -* Fri Jun 27 2008 crrodriguez@suse.de -- disable unusable static libraries -* Wed Jan 17 2007 joeshaw@suse.de -- Update to 1.2.2. It requires libgsf and glib2 now, and I've - updated some patches and dropepd others. -* Wed Nov 15 2006 prusnak@suse.cz -- fixed VUL-0: overflow (overflow.patch) [#215612] -* Sat Oct 21 2006 dmueller@suse.de -- build against system expat to reduce code size -* Thu Jan 26 2006 nadvornik@suse.cz -- fixed libdir in pkgconfig file [#115679] -* Wed Jan 25 2006 mls@suse.de -- converted neededforbuild to BuildRequires -* Thu Jan 12 2006 nadvornik@suse.cz -- compile with -fstack-protector -* Thu Aug 04 2005 gekker@suse.de -- Fix to open files RO rather than RW -* Mon Feb 07 2005 nadvornik@suse.cz -- updated to 1.0.3 -* Thu Nov 11 2004 sbrabec@suse.cz -- Fixed buffer overflow in the wvHandleDateTimePicture function in wv - library: CAN-2004-0645 (#47767). -* Tue Mar 30 2004 nadvornik@suse.cz -- prefer w3m in wvText as it handles UTF-8 output better -- better temp file handling in wvText -* Fri Feb 13 2004 meissner@suse.de -- fixed pkgconfig path. -* Thu Feb 12 2004 ro@suse.de -- added directory /usr/include/wv to devel filelist -* Wed Feb 11 2004 nadvornik@suse.cz -- updated to 1.0.0 -- compile with -fno-strict-aliasing -* Sat Jan 10 2004 adrian@suse.de -- add %%run_ldconfig -* Mon Jul 28 2003 nadvornik@suse.cz -- updated to 0.7.6 -* Wed Jun 18 2003 nadvornik@suse.cz -- fixed to compile with new libwmf -* Thu May 29 2003 nadvornik@suse.cz -- packaged wv.h -* Wed Sep 11 2002 ro@suse.de -- fixed patch (my fault) -* Wed Sep 11 2002 pthomas@suse.de -- Make wvText output to stdout on request. -- Add missing itmes to my last entry. -* Wed Sep 11 2002 ro@suse.de -- fixed requires of devel-package -* Tue Sep 10 2002 pthomas@suse.de -- Change wvText to use either w3m or lynx. -- wv-devel requires wv of same version. -- Require w3m -- Filter out /usr/include from CPPFLAGS. -- Don't patch config.h.in but instead call autoheader to - regenerate it. -* Fri Jul 26 2002 adrian@suse.de -- fix neededforbuild -* Thu Jun 20 2002 nadvornik@suse.cz -- update to 0.7.2 -* Fri Apr 05 2002 nadvornik@suse.cz -- fixed instalation of manpages -* Thu Apr 04 2002 nadvornik@suse.cz -- fixed to compile with new autoconf -* Fri Mar 08 2002 nadvornik@suse.cz -- fixed permissions and removed CVS dirs in doc directory -* Thu Feb 07 2002 nadvornik@suse.cz -- update to 0.7.1: - - built with shared library -* Fri Feb 01 2002 ro@suse.de -- changed neededforbuild to -* Wed Nov 28 2001 nadvornik@suse.cz -- update to 0.7.0: - - compiles with libwmf 0.2.2 -* Thu Jun 28 2001 nadvornik@suse.cz -- update to 0.6.5 -- libwmf is now a separate package -* Wed Jun 13 2001 nadvornik@suse.cz -- fixed to compile with new autoconf -* Fri May 18 2001 nadvornik@suse.cz -- fixed cast warnings and include files for ia64 -* Mon Apr 23 2001 nadvornik@suse.cz -- fixed to compile on s390 -* Mon Mar 12 2001 nadvornik@suse.cz -- libwmf compiled with -fPIC, now it can be linked to - ImageMagick module -* Thu Feb 08 2001 nadvornik@suse.cz -- update wv to 0.6.4, libwmf to 0.1.21 -- fixed bug #6165 -* Wed Nov 22 2000 nadvornik@suse.cz -- fixed docdir name -* Tue Nov 21 2000 schwab@suse.de -- Fix permissions. -- Remove all CVS directories. -- Avoid double slashes. -* Fri Nov 10 2000 nadvornik@suse.cz -- rename mswordvw -> wv -- mswordvd -> wv-devel -- update wv to 0.6.2, libwmf to 0.1.20 -* Wed Nov 08 2000 ro@suse.de -- fixed neededforbuild for ImageMagick -* Mon Oct 09 2000 nadvornik@suse.cz -- fixed Copyright -- used bzip2 -* Mon Sep 18 2000 nadvornik@suse.cz -- added magickd to neededforbuild -- fixed to compile -* Mon Jun 19 2000 nadvornik@suse.cz -- update to 0.5.44 -* Mon Jun 05 2000 nadvornik@suse.cz -- fixed to compile with ImageMagick-5.2.0 -* Fri May 26 2000 schwab@suse.de -- Update config files. -* Thu May 18 2000 nadvornik@suse.cz -- used %%{_defaultdocdir} -* Tue May 02 2000 nadvornik@suse.cz -- fixed to compile -* Thu Apr 20 2000 nadvornik@suse.cz -- fixed filelist -- created development subpackage mswordvd -* Tue Apr 18 2000 nadvornik@suse.cz -- update to 0.5.43, libwmf 0.1.17 -- added Buildroot -* Mon Jan 31 2000 kukuk@suse.de -- Update to 0.5.14-bw6 -- Fix spec file -- Move /usr/man -> /usr/share/man -* Mon Sep 13 1999 bs@suse.de -- ran old prepare_spec on spec file to switch to new prepare_spec. -* Wed Aug 04 1999 uli@suse.de -- added some missing files -* Fri May 21 1999 kukuk@suse.de -- Update mswordview to 0.5.14 -* Thu Apr 29 1999 kukuk@suse.de -- first initial version of mswordview 0.5.10 with libwmf 0.1.9