Hello community, here is the log from the commit of package writerperfect for openSUSE:Factory checked in at 2018-01-10 23:34:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/writerperfect (Old) and /work/SRC/openSUSE:Factory/.writerperfect.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "writerperfect" Wed Jan 10 23:34:58 2018 rev:9 rq:562779 version:0.9.6 Changes: -------- --- /work/SRC/openSUSE:Factory/writerperfect/writerperfect.changes 2016-04-12 19:31:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.writerperfect.new/writerperfect.changes 2018-01-10 23:35:00.736461816 +0100 @@ -1,0 +2,37 @@ +Tue Jan 9 07:42:56 UTC 2018 - fst...@suse.com + +- Added patch: + * 0001-Fix-linking-with-newer-tools-by-getting-the-library-.patch$ + + Get the library order right + + Fixes linking with newer tools + +------------------------------------------------------------------- +Fri Dec 29 00:30:53 UTC 2017 - jeng...@inai.de + +- Drop (tm) symbols + +------------------------------------------------------------------- +Wed Dec 20 12:23:55 UTC 2017 - tchva...@suse.com + +- Version update to 0.9.6: + * Add support for conversion of Zoner Draw documents using libzmf. The + new tools are called zmf2odg and zmf2epub. + * Handle StarOffice Writer documents (.sdw). + * Allow conversion of StarOffice documents to EPUB and Abiword too. The + new tools are called sd2epub and sd2abw. + * Fix configure check for libeot. + * Add universal conversion tools that handle any supported input + format. + The new tools are called wpft2abw, wpft2ebub and wpfg2odf. + * Fix some CppCheck warnings. + * Let mwaw2* properly handle files with a resource fork. + * Handle Lotus files with an associated format file. + * Switch to C++11. + * Add support for conversion of QuarkXPress documents using libqxp. The + new tools are called qxp2odg and qxp2epub. + * Default to libepubgen 0.1 (0.0 is used as a fallback). + * Add options for setting EPUB version, splitting method and layout + type (only for EPUB 3.0) to all EPUB-converting tools. +- Add patch 0001-fix-build-with-libgsf.patch + +------------------------------------------------------------------- Old: ---- writerperfect-0.9.5.tar.xz New: ---- 0001-Fix-linking-with-newer-tools-by-getting-the-library-.patch 0001-fix-build-with-libgsf.patch writerperfect-0.9.6.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ writerperfect.spec ++++++ --- /var/tmp/diff_new_pack.pH8KyP/_old 2018-01-10 23:35:01.368432162 +0100 +++ /var/tmp/diff_new_pack.pH8KyP/_new 2018-01-10 23:35:01.372431975 +0100 @@ -1,7 +1,7 @@ # # spec file for package writerperfect # -# Copyright (c) 2016 SUSE LINUX 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 @@ -17,30 +17,35 @@ Name: writerperfect -Version: 0.9.5 +Version: 0.9.6 Release: 0 -Summary: Tools for converting WordPerfect(tm) documents -License: LGPL-2.1+ or MPL-2.0+ +Summary: Tools for converting WordPerfect documents +License: LGPL-2.1+ OR MPL-2.0+ Group: Productivity/Text/Convertors Url: http://libwpd.sf.net/ Source: http://downloads.sourceforge.net/project/libwpd/%{name}/%{name}-%{version}/%{name}-%{version}.tar.xz +Patch0: 0001-fix-build-with-libgsf.patch +Patch1: 0001-Fix-linking-with-newer-tools-by-getting-the-library-.patch +BuildRequires: autoconf +BuildRequires: automake BuildRequires: gcc-c++ -BuildRequires: glib2-devel >= 2.0.0 -BuildRequires: libgsf-devel >= 1.6.0 +BuildRequires: libtool BuildRequires: pkgconfig -BuildRequires: xz +BuildRequires: pkgconfig(glib-2.0) >= 2.0.0 BuildRequires: pkgconfig(libabw-0.1) BuildRequires: pkgconfig(libcdr-0.1) BuildRequires: pkgconfig(libe-book-0.1) BuildRequires: pkgconfig(libeot) -BuildRequires: pkgconfig(libepubgen-0.0) +BuildRequires: pkgconfig(libepubgen-0.1) BuildRequires: pkgconfig(libetonyek-0.1) BuildRequires: pkgconfig(libfreehand-0.1) BuildRequires: pkgconfig(libgsf-1) +BuildRequires: pkgconfig(libgsf-1) >= 1.6.0 BuildRequires: pkgconfig(libmspub-0.1) BuildRequires: pkgconfig(libmwaw-0.3) BuildRequires: pkgconfig(libodfgen-0.1) BuildRequires: pkgconfig(libpagemaker-0.0) +BuildRequires: pkgconfig(libqxp-0.0) BuildRequires: pkgconfig(librevenge-0.0) >= 0.0.1 BuildRequires: pkgconfig(librevenge-stream-0.0) BuildRequires: pkgconfig(librvngabw-0.0) @@ -49,7 +54,10 @@ BuildRequires: pkgconfig(libwpd-0.10) BuildRequires: pkgconfig(libwpg-0.3) BuildRequires: pkgconfig(libwps-0.4) +BuildRequires: pkgconfig(libzmf-0.0) # Make upgrade smooth with no conflicting files +Provides: abw2abw = %{version}-%{release} +Obsoletes: abw2abw < %{version}-%{release} Provides: abw2epub = %{version}-%{release} Obsoletes: abw2epub < %{version}-%{release} Provides: abw2odt = %{version}-%{release} @@ -62,6 +70,8 @@ Obsoletes: cmx2epub < %{version}-%{release} Provides: cmx2odg = %{version}-%{release} Obsoletes: cmx2odg < %{version}-%{release} +Provides: ebook2abw = %{version}-%{release} +Obsoletes: ebook2abw < %{version}-%{release} Provides: ebook2epub = %{version}-%{release} Obsoletes: ebook2epub < %{version}-%{release} Provides: ebook2odt = %{version}-%{release} @@ -74,12 +84,16 @@ Obsoletes: key2epub < %{version}-%{release} Provides: key2odp = %{version}-%{release} Obsoletes: key2odp < %{version}-%{release} +Provides: mwaw2abw = %{version}-%{release} +Obsoletes: mwaw2abw < %{version}-%{release} Provides: mwaw2epub = %{version}-%{release} Obsoletes: mwaw2epub < %{version}-%{release} Provides: mwaw2odf = %{version}-%{release} Obsoletes: mwaw2odf < %{version}-%{release} Provides: numbers2ods = %{version}-%{release} Obsoletes: numbers2ods < %{version}-%{release} +Provides: pages2abw = %{version}-%{release} +Obsoletes: pages2abw < %{version}-%{release} Provides: pages2epub = %{version}-%{release} Obsoletes: pages2epub < %{version}-%{release} Provides: pages2odt = %{version}-%{release} @@ -92,6 +106,16 @@ Obsoletes: pub2epub < %{version}-%{release} Provides: pub2odg = %{version}-%{release} Obsoletes: pub2odg < %{version}-%{release} +Provides: qxp2epub = %{version}-%{release} +Obsoletes: qxp2epub < %{version}-%{release} +Provides: qxp2odg = %{version}-%{release} +Obsoletes: qxp2odg < %{version}-%{release} +Provides: sd2abw = %{version}-%{release} +Obsoletes: sd2abw < %{version}-%{release} +Provides: sd2epub = %{version}-%{release} +Obsoletes: sd2epub < %{version}-%{release} +Provides: sd2odf = %{version}-%{release} +Obsoletes: sd2odf < %{version}-%{release} Provides: vsd2epub = %{version}-%{release} Obsoletes: vsd2epub < %{version}-%{release} Provides: vsd2odg = %{version}-%{release} @@ -102,86 +126,108 @@ Obsoletes: vss2odg < %{version}-%{release} Provides: wks2ods = %{version}-%{release} Obsoletes: wks2ods < %{version}-%{release} +Provides: wpd2abw = %{version}-%{release} +Obsoletes: wpd2abw < %{version}-%{release} Provides: wpd2epub = %{version}-%{release} Obsoletes: wpd2epub < %{version}-%{release} Provides: wpd2odt = %{version}-%{release} Obsoletes: wpd2odt < %{version}-%{release} +Provides: wpft2abw = %{version}-%{release} +Obsoletes: wpft2abw < %{version}-%{release} +Provides: wpft2epub = %{version}-%{release} +Obsoletes: wpft2epub < %{version}-%{release} +Provides: wpft2odf = %{version}-%{release} +Obsoletes: wpft2odf < %{version}-%{release} Provides: wpg2epub = %{version}-%{release} Obsoletes: wpg2epub < %{version}-%{release} Provides: wpg2odg = %{version}-%{release} Obsoletes: wpg2odg < %{version}-%{release} +Provides: wps2abw = %{version}-%{release} +Obsoletes: wps2abw < %{version}-%{release} Provides: wps2epub = %{version}-%{release} Obsoletes: wps2epub < %{version}-%{release} Provides: wps2odt = %{version}-%{release} Obsoletes: wps2odt < %{version}-%{release} -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Provides: zmf2epub = %{version}-%{release} +Obsoletes: zmf2epub < %{version}-%{release} +Provides: zmf2odg = %{version}-%{release} +Obsoletes: zmf2odg < %{version}-%{release} %description -Tools for converting WordPerfect(tm) and other documents to various other +Tools for converting WordPerfect and other documents to various other formats supported by the helper libraries that are also ie. used in libreoffice. %prep -%setup -q +%autosetup -p1 %build -# libgsf is default off +libtoolize --force --copy --install +autoreconf -fi %configure \ --disable-werror \ - --with-libgsf \ --disable-silent-rules \ - --with-sharedptr=c++11 + --with-import-libs \ + --with-export-libs \ + --with-libeot \ + --with-libgsf make %{?_smp_mflags} %install -make %{?_smp_mflags} DESTDIR=%{buildroot} install +%make_install %files -%defattr(-,root,root) -%doc COPYING.* NEWS README +%doc NEWS README +%license COPYING.MPL COPYING.LGPL # Name binaries to be sure we do not lose features due to wrong # configure checks %{_bindir}/abw2abw -%{_bindir}/ebook2abw -%{_bindir}/mwaw2abw -%{_bindir}/pages2abw -%{_bindir}/wpd2abw -%{_bindir}/wps2abw -%{_bindir}/abw2epub -%{_bindir}/abw2odt -%{_bindir}/ebook2epub -%{_bindir}/ebook2odt -%{_bindir}/numbers2ods %{_bindir}/abw2epub %{_bindir}/abw2odt %{_bindir}/cdr2epub %{_bindir}/cdr2odg %{_bindir}/cmx2epub %{_bindir}/cmx2odg +%{_bindir}/ebook2abw +%{_bindir}/ebook2epub %{_bindir}/ebook2odt %{_bindir}/fh2epub %{_bindir}/fh2odg %{_bindir}/key2epub %{_bindir}/key2odp +%{_bindir}/mwaw2abw %{_bindir}/mwaw2epub %{_bindir}/mwaw2odf +%{_bindir}/numbers2ods +%{_bindir}/pages2abw %{_bindir}/pages2epub %{_bindir}/pages2odt %{_bindir}/pmd2epub %{_bindir}/pmd2odg %{_bindir}/pub2epub %{_bindir}/pub2odg +%{_bindir}/qxp2epub +%{_bindir}/qxp2odg +%{_bindir}/sd2abw +%{_bindir}/sd2epub %{_bindir}/sd2odf %{_bindir}/vsd2epub %{_bindir}/vsd2odg %{_bindir}/vss2epub %{_bindir}/vss2odg %{_bindir}/wks2ods +%{_bindir}/wpd2abw %{_bindir}/wpd2epub %{_bindir}/wpd2odt +%{_bindir}/wpft2abw +%{_bindir}/wpft2epub +%{_bindir}/wpft2odf %{_bindir}/wpg2epub %{_bindir}/wpg2odg +%{_bindir}/wps2abw %{_bindir}/wps2epub %{_bindir}/wps2odt +%{_bindir}/zmf2epub +%{_bindir}/zmf2odg %changelog ++++++ 0001-Fix-linking-with-newer-tools-by-getting-the-library-.patch ++++++ >From b881efabd544f34d82410bb937fce1d599dde070 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.st...@bluewin.ch> Date: Tue, 9 Jan 2018 08:41:48 +0100 Subject: [PATCH] Fix linking with newer tools by getting the library order right --- src/conv/abw/Makefile.am | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/conv/abw/Makefile.am b/src/conv/abw/Makefile.am index b52d060..3b20f05 100644 --- a/src/conv/abw/Makefile.am +++ b/src/conv/abw/Makefile.am @@ -23,10 +23,13 @@ libhelperRVNGABW_la_SOURCES = \ wpft2abw_DEPENDENCIES = @WPFT2ABW_WIN32_RESOURCE@ libhelperRVNGABW.la wpft2abw_CPPFLAGS = $(REVENGE_STREAM_CFLAGS) -wpft2abw_LDADD = $(REVENGE_STREAM_LIBS) +wpft2abw_LDADD = wpft2abw_SOURCES = wpft2abw.cxx if USE_LIBABW + wpft2abw_CPPFLAGS += $(ABW_CFLAGS) + wpft2abw_LDADD += $(wrapper_dir)/libwpabw.la $(ABW_LIBS) + bin_PROGRAMS += abw2abw abw2abw_DEPENDENCIES = @ABW2ABW_WIN32_RESOURCE@ libhelperRVNGABW.la @@ -37,7 +40,7 @@ endif if USE_LIBEBOOK wpft2abw_CPPFLAGS += $(EBOOK_CFLAGS) - wpft2abw_LDADD += $(EBOOK_LIBS) $(wrapper_dir)/libwpebook.la + wpft2abw_LDADD += $(wrapper_dir)/libwpebook.la $(EBOOK_LIBS) bin_PROGRAMS += ebook2abw @@ -49,7 +52,7 @@ endif if USE_LIBETONYEK wpft2abw_CPPFLAGS += $(ETONYEK_CFLAGS) - wpft2abw_LDADD += $(ETONYEK_LIBS) $(wrapper_dir)/libwpetonyek.la + wpft2abw_LDADD += $(wrapper_dir)/libwpetonyek.la $(ETONYEK_LIBS) bin_PROGRAMS += pages2abw @@ -68,7 +71,7 @@ if USE_LIBMWAW wpft2abw_DEPENDENCIES += libabwmwaw.la wpft2abw_CPPFLAGS += $(MWAW_CFLAGS) - wpft2abw_LDADD += $(MWAW_LIBS) libabwmwaw.la + wpft2abw_LDADD += libabwmwaw.la $(MWAW_LIBS) bin_PROGRAMS += mwaw2abw @@ -87,7 +90,7 @@ if USE_LIBSTAROFFICE wpft2abw_DEPENDENCIES += libabwstaroffice.la wpft2abw_CPPFLAGS += $(STAROFFICE_CFLAGS) - wpft2abw_LDADD += $(STAROFFICE_LIBS) libabwstaroffice.la + wpft2abw_LDADD += libabwstaroffice.la $(STAROFFICE_LIBS) bin_PROGRAMS += sd2abw @@ -106,7 +109,7 @@ if USE_LIBWPD wpft2abw_DEPENDENCIES += libabwwpd.la wpft2abw_CPPFLAGS += $(WPD_CFLAGS) $(WPG_CFLAGS) - wpft2abw_LDADD += $(WPD_LIBS) $(WPG_LIBS) libabwwpd.la + wpft2abw_LDADD += libabwwpd.la $(WPD_LIBS) $(WPG_LIBS) bin_PROGRAMS += wpd2abw wpd2abw_DEPENDENCIES = @WPD2ABW_WIN32_RESOURCE@ libhelperRVNGABW.la libabwwpd.la @@ -124,7 +127,7 @@ if USE_LIBWPS wpft2abw_DEPENDENCIES += libabwwps.la wpft2abw_CPPFLAGS += $(WPS_CFLAGS) - wpft2abw_LDADD += $(WPS_LIBS) libabwwps.la + wpft2abw_LDADD += libabwwps.la $(WPS_LIBS) bin_PROGRAMS += wps2abw @@ -134,7 +137,7 @@ if USE_LIBWPS wps2abw_SOURCES = wps2abw.cxx endif -wpft2abw_LDADD += @WPFT2ABW_WIN32_RESOURCE@ libhelperRVNGABW.la +wpft2abw_LDADD += @WPFT2ABW_WIN32_RESOURCE@ libhelperRVNGABW.la $(REVENGE_STREAM_LIBS) if OS_WIN32 -- 2.15.1 ++++++ 0001-fix-build-with-libgsf.patch ++++++ >From 8313cd28950a529adfe670b7072b31aabc8fc961 Mon Sep 17 00:00:00 2001 From: David Tardon <dtar...@redhat.com> Date: Thu, 14 Dec 2017 15:14:34 +0100 Subject: [PATCH] fix build with libgsf --- src/lib/OutputFileHelper.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/OutputFileHelper.cxx b/src/lib/OutputFileHelper.cxx index 739ab22..7f5e4b8 100644 --- a/src/lib/OutputFileHelper.cxx +++ b/src/lib/OutputFileHelper.cxx @@ -57,7 +57,7 @@ private: OutputFileHelperImpl::~OutputFileHelperImpl() { #ifdef USE_GSF_OUTPUT - if (mpOutfile && !gsf_output_close((GsfOutput *) mpOutfile.get())) + if (mpOutfile && !gsf_output_close((GsfOutput *) mpOutfile)) fprintf(stderr, "ERROR : Couldn't close outfile\n"); if (mpOutfile) -- 2.14.3 ++++++ writerperfect-0.9.5.tar.xz -> writerperfect-0.9.6.tar.xz ++++++ ++++ 22509 lines of diff (skipped)
