pool/wv
SHA256
4
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 572335 from home:avindra

Browse Source 
- Update to 1.2.9
  * fixes BC break from 1.2.8
- includes 1.2.8
  * Fix segfault trying to parse certain word documents
  * Fix Tables not imported from MS Word documents
  * Fix wvWare hangs on this seemingly blank word doc
  * Buildfix: Remove unused LINK_WIN32_DLL check
  * Buildfix: link with -no-undefined
- includes 1.2.7 
  * Fix regression: newlines not imported anymore
  * Cross building improvements
  * Fix build issue: 'libtool: link: `-::-' is not valid version
    information'
- includes 1.2.6
  * unportable test construct.
  * Fix typos in wvWare's help message.
  * Fix a few mis-matched wvMalloc/malloc/wvFree/free combinations.
    Use glib to allocate and free all of our memory.
  * a NULL pointer was causing a crash.
  * Default font alignment in paragraph was incorrect.
  * Crash in the PAP handling.
  * Fix a memory leak in wvRTF.
  * Fix huge performance issue while loading images
  * Fix invalid writes in wvConfig.c
- cleanup with spec-cleaner
- use new upstream url
- rebase wv-1.2.2-automake.patch
- rebase wv-1.0.3-wvText.patch
- drop wv-1.0.3-pc.patch (applied upstream)

OBS-URL: https://build.opensuse.org/request/show/572335
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/wv?expand=0&rev=21
This commit is contained in:
Ismail Dönmez 2018-02-05 10:24:32 +00:00 committed by Git OBS Bridge
parent 2f006c06df
commit c5e4c2dc10
8 changed files with 62 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wv-1.0.3-pc.patch
View File

@ -1,10 +0,0 @@
--- wv-1.0.pc.in
+++ wv-1.0.pc.in
@@ -1,6 +1,6 @@
prefix=@prefix@
exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=@libdir@
includedir=${prefix}/include
Name: wvWare

4
wv-1.0.3-wvText.patch
View File

@ -57,11 +57,11 @@
if [ $USE_DUMP -eq "1" ]; then
- echo "Could not find required program 'elinks' or 'links'"
+ echo "Could not find required program 'w3m', 'elinks' or 'links'"
echo "Using lynx. Ouput will be pretty ugly."
echo "Using lynx. Output will be pretty ugly."
elif [ $USE_DUMP -eq "0" ]; then
- echo "Could not find required program 'elinks', 'links', or even 'lynx'"
+ echo "Could not find required program 'w3m', 'elinks', 'links', or even 'lynx'"
echo "Using wvWare -x wvText.xml. Ouput will be pretty bad."
echo "Using wvWare -x wvText.xml. Output will be pretty bad."
fi
@@ -41,6 +55,7 @@

10
wv-1.2.2-automake.patch
View File

@ -1,5 +1,3 @@
Index: GNUmakefile.am
===================================================================
--- GNUmakefile.am.orig
+++ GNUmakefile.am
@@ -1,3 +1,5 @@
@ -8,12 +6,12 @@ Index: GNUmakefile.am
DIST_SUBDIRS = xml help wingdingfont patterns
SUBDIRS = xml help wingdingfont patterns .
@@ -8,7 +10,7 @@ INCLUDES = -I. -I$(top_builddir) -I$(src
@@ -8,7 +10,7 @@
CFLAGS = @CFLAGS@ @ANSI_CFLAGS@
-CPPFLAGS = @CPPFLAGS@ @WMF_CFLAGS@ @XML_CFLAGS@ @GLIB_CFLAGS@ @GSF_CFLAGS@ @PNG_CFLAGS@ @ZLIB_CFLAGS@
+CPPFLAGS = $(filter-out -I/usr/include,@CPPFLAGS@ @WMF_CFLAGS@ @XML_CFLAGS@ @GLIB_CFLAGS@ @GSF_CFLAGS@ @PNG_CFLAGS@ @ZLIB_CFLAGS@)
-CPPFLAGS = @CPPFLAGS@ @DEPS_CFLAGS@ @OPT_CFLAGS@
+CPPFLAGS = $(filter-out -I/usr/include,@CPPFLAGS@ @DEPS_CFLAGS@ @OPT_CFLAGS@)
WVLIBS = @WMF_LIBS@ @XML_LIBS@ @GLIB_LIBS@ @GSF_LIBS@ @PNG_LIBS@ @ZLIB_LIBS@ @LIBS@ -lm
WVLIBS = @DEPS_LIBS@ @OPT_LIBS@ -lm

3
wv-1.2.2.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c47be725f609159c94ff65eea853a7db9c4036061ab21883d292441b720ffbd4
size 628165

3
wv-1.2.4.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:673109910e22d4cf94cc8be4dcb9a0c41b5fbdb1736d4b7bdc7778894d57c2d6
size 629554

3
wv-1.2.9.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4c730d3b325c0785450dd3a043eeb53e1518598c4f41f155558385dd2635c19d
size 616256

33
wv.changes
View File

@ -1,3 +1,36 @@
-------------------------------------------------------------------
Sat Feb 3 19:18:02 UTC 2018 - avindra@opensuse.org
- Update to 1.2.9
* fixes BC break from 1.2.8
- includes 1.2.8
* Fix segfault trying to parse certain word documents
* Fix Tables not imported from MS Word documents
* Fix wvWare hangs on this seemingly blank word doc
* Buildfix: Remove unused LINK_WIN32_DLL check
* Buildfix: link with -no-undefined
- includes 1.2.7
* Fix regression: newlines not imported anymore
* Cross building improvements
* Fix build issue: 'libtool: link: `-::-' is not valid version
information'
- includes 1.2.6
* unportable test construct.
* Fix typos in wvWare's help message.
* Fix a few mis-matched wvMalloc/malloc/wvFree/free combinations.
Use glib to allocate and free all of our memory.
* a NULL pointer was causing a crash.
* Default font alignment in paragraph was incorrect.
* Crash in the PAP handling.
* Fix a memory leak in wvRTF.
* Fix huge performance issue while loading images
* Fix invalid writes in wvConfig.c
- cleanup with spec-cleaner
- use new upstream url
- rebase wv-1.2.2-automake.patch
- rebase wv-1.0.3-wvText.patch
- drop wv-1.0.3-pc.patch (applied upstream)
-------------------------------------------------------------------
Tue Oct 8 09:45:30 UTC 2013 - mvyskocil@suse.com

48
wv.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package wv
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2018 SUSE LINUX 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,25 +16,21 @@
#
%global lname libwv-1_2-3
%global lname libwv-1_2-4
Name: wv
Version: 1.2.4
Version: 1.2.9
Release: 0
Summary: Tools for Importing Microsoft Word (tm) Documents
License: GPL-2.0+
Group: Productivity/Publishing/Word
Url: http://wvware.sourceforge.net/
Source0: http://prdownloads.sourceforge.net/wvware/%{name}-%{version}.tar.gz
Source0: https://www.abisource.com/downloads/%{name}/%{version}/%{name}-%{version}.tar.gz
Patch0: wv-1.2.2-automake.patch
Patch5: wv-1.0.3-wvText.patch
Patch7: wv-1.0.3-pc.patch
Patch9: wv-1.2.2-fiximplicit.patch
Patch10: wv-strcasecmp.patch
Patch11: wv-gsf.patch
Patch12: wv-noansi.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: w3m
BuildRequires: libtool
BuildRequires: libwmf-devel
BuildRequires: pkgconfig
@ -42,25 +38,26 @@ BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(libgsf-1)
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(zlib)
Requires: w3m
%description
WV is a program that can understand the Microsoft Word 8 binary file
format (Office97). It currently converts Word into HTML, which can then
be read with a web browser.
%package -n %lname
%package -n %{lname}
Summary: Library for importing Microsoft Word documents
Group: System/Libraries
%description -n %lname
%description -n %{lname}
libwv can parse the Microsoft Word 8 binary file format (Office97).
%package devel
Requires: %lname = %version
Requires: libgsf-devel
Requires: libwmf-devel
Summary: Static Libraries and Header Files for wv
Group: Development/Libraries/C and C++
Requires: %{lname} = %{version}
Requires: libgsf-devel
Requires: libwmf-devel
%description devel
Static Libraries and Header Files for wv.
@ -69,7 +66,6 @@ Static Libraries and Header Files for wv.
%setup -q
%patch0
%patch5
%patch7
%patch9 -p1
%patch10 -p1
%if 0%{?suse_version} > 1230
@ -80,7 +76,7 @@ Static Libraries and Header Files for wv.
%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" \
CFLAGS="%{optflags} %{warn_flags} -fno-strict-aliasing -fstack-protector" \
%configure \
--with-libwmf \
--with-expat \
@ -91,19 +87,17 @@ CFLAGS="$RPM_OPT_FLAGS %{warn_flags} -fno-strict-aliasing -fstack-protector" \
make %{?_smp_mflags}
%install
make DESTDIR=$RPM_BUILD_ROOT manonedir=%{_mandir}/man1 install
rm -f %{buildroot}%{_libdir}/*.la
%make_install manonedir=%{_mandir}/man1
find %{buildroot} -type f -name "*.la" -delete -print
%check
make check
make %{?_smp_mflags} check
%post -n %lname -p /sbin/ldconfig
%postun -n %lname -p /sbin/ldconfig
%post -n %{lname} -p /sbin/ldconfig
%postun -n %{lname} -p /sbin/ldconfig
%files
%defattr(-,root,root)
%doc COPYING README
%doc COPYING README
%{_bindir}/wvAbw
%{_bindir}/wvCleanLatex
%{_bindir}/wvConvert
@ -121,14 +115,12 @@ make check
%{_bindir}/wvWml
%{_bindir}/wvDocBook
%{_datadir}/wv
%doc %{_mandir}/*/*
%{_mandir}/*/*
%files -n %lname
%defattr(-,root,root)
%_libdir/libwv-1.2.so.*
%files -n %{lname}
%{_libdir}/libwv-1.2.so.*
%files devel
%defattr(-,root,root)
%{_includedir}/wv
%{_libdir}/libwv.so
%{_libdir}/pkgconfig/%{name}-1.0.pc