From 835ea591c3bd8eb018300d79f54945093783e251 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Dec 18 2017 09:39:21 +0000 Subject: new upstream release 0.9.6 --- diff --git a/.gitignore b/.gitignore index 7fe1d64..f9490ab 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /writerperfect-0.9.2.tar.xz /writerperfect-0.9.4.tar.xz /writerperfect-0.9.5.tar.xz +/writerperfect-0.9.6.tar.xz diff --git a/0001-fix-build-with-libgsf.patch b/0001-fix-build-with-libgsf.patch new file mode 100644 index 0000000..53a7ba8 --- /dev/null +++ b/0001-fix-build-with-libgsf.patch @@ -0,0 +1,25 @@ +From 8313cd28950a529adfe670b7072b31aabc8fc961 Mon Sep 17 00:00:00 2001 +From: David Tardon +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 + diff --git a/0001-update-help-output-for-fh2epub-too.patch b/0001-update-help-output-for-fh2epub-too.patch deleted file mode 100644 index f03a6dd..0000000 --- a/0001-update-help-output-for-fh2epub-too.patch +++ /dev/null @@ -1,29 +0,0 @@ -From cbd1331f47dabfebeb9e594334be6edaded2b553 Mon Sep 17 00:00:00 2001 -From: David Tardon -Date: Thu, 3 Mar 2016 17:16:54 +0100 -Subject: [PATCH] update help output for fh2epub too - ---- - src/conv/epub/fh2epub.cxx | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/src/conv/epub/fh2epub.cxx b/src/conv/epub/fh2epub.cxx -index f2c15d0..076be20 100644 ---- a/src/conv/epub/fh2epub.cxx -+++ b/src/conv/epub/fh2epub.cxx -@@ -55,10 +55,8 @@ private: - - int printUsage(const char *name) - { -- fprintf(stderr, "Usage : %s \n", name); -- fprintf(stderr, "\twhere is the Freehand source drawing\n"); -- fprintf(stderr, "\tand is the ePub target document.\n"); -- return 1; -+ UsageHelper usage(name, "converts Adobe FreeHand documents to ePub.", "[OPTIONS] INPUT OUTPUT"); -+ return usage.printUsage(); - } - - int main(int argc, char *argv[]) --- -2.5.0 - diff --git a/sources b/sources index 5f224e8..42828fa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d7f1faa71bc0278d68ba0cf24dadfcdf writerperfect-0.9.5.tar.xz +SHA512 (writerperfect-0.9.6.tar.xz) = 4a86a23ae2caa133066279994255d8ca7ee16f40ad646bd8ff434c7e4e1a29cf23db7e811b8eca1823dcf9e2456b2e8dbacf03bd5bc0377638fc52fc7d4495a5 diff --git a/writerperfect.spec b/writerperfect.spec index 19525e9..3d869cf 100644 --- a/writerperfect.spec +++ b/writerperfect.spec @@ -1,6 +1,6 @@ Name: writerperfect -Version: 0.9.5 -Release: 6%{?dist} +Version: 0.9.6 +Release: 1%{?dist} Summary: A collection of tools to transform various file formats into ODF License: MPLv2.0 or LGPLv2+ @@ -19,6 +19,7 @@ BuildRequires: pkgconfig(libgsf-1) BuildRequires: pkgconfig(libmspub-0.1) BuildRequires: pkgconfig(libmwaw-0.3) BuildRequires: pkgconfig(libodfgen-0.1) +BuildRequires: pkgconfig(libqxp-0.0) BuildRequires: pkgconfig(libpagemaker-0.0) BuildRequires: pkgconfig(librevenge-0.0) BuildRequires: pkgconfig(librvngabw-0.0) @@ -27,8 +28,9 @@ BuildRequires: pkgconfig(libvisio-0.1) BuildRequires: pkgconfig(libwpd-0.10) BuildRequires: pkgconfig(libwpg-0.3) BuildRequires: pkgconfig(libwps-0.4) +BuildRequires: pkgconfig(libzmf-0.0) -Patch0: 0001-update-help-output-for-fh2epub-too.patch +Patch0: 0001-fix-build-with-libgsf.patch %description %{name} is a collection of command-line tools to transform various document @@ -41,6 +43,7 @@ formats into ODF. Among supported input formats are: * Microsoft Publisher * Microsoft Visio * Microsoft Works +* QuarkXPress %package epub Summary: A collection of tools to transform various file formats into EPUB @@ -77,8 +80,7 @@ formats into AbiWord format. Among supported input formats are: --with-import-libs \ --with-export-libs \ --with-libeot \ - --with-libgsf \ - --with-sharedptr=c++11 + --with-libgsf make %{?_smp_mflags} @@ -104,6 +106,7 @@ install -m 0644 *2abw.1 *2epub.1 *2od?.1 %{buildroot}/%{_mandir}/man1 %{_bindir}/key2odp %{_bindir}/mwaw2odf %{_bindir}/numbers2ods +%{_bindir}/qxp2odg %{_bindir}/pages2odt %{_bindir}/pmd2odg %{_bindir}/pub2odg @@ -112,8 +115,10 @@ install -m 0644 *2abw.1 *2epub.1 *2od?.1 %{buildroot}/%{_mandir}/man1 %{_bindir}/vss2odg %{_bindir}/wks2ods %{_bindir}/wpd2odt +%{_bindir}/wpft2odf %{_bindir}/wpg2odg %{_bindir}/wps2odt +%{_bindir}/zmf2odg %{_mandir}/man1/abw2odt.1* %{_mandir}/man1/cdr2odg.1* %{_mandir}/man1/cmx2odg.1* @@ -125,13 +130,16 @@ install -m 0644 *2abw.1 *2epub.1 *2od?.1 %{buildroot}/%{_mandir}/man1 %{_mandir}/man1/pages2odt.1* %{_mandir}/man1/pmd2odg.1* %{_mandir}/man1/pub2odg.1* +%{_mandir}/man1/qxp2odg.1* %{_mandir}/man1/sd2odf.1* %{_mandir}/man1/vsd2odg.1* %{_mandir}/man1/vss2odg.1* %{_mandir}/man1/wks2ods.1* %{_mandir}/man1/wpd2odt.1* +%{_mandir}/man1/wpft2odf.1* %{_mandir}/man1/wpg2odg.1* %{_mandir}/man1/wps2odt.1* +%{_mandir}/man1/zmf2odg.1* %files epub %doc NEWS README @@ -146,11 +154,15 @@ install -m 0644 *2abw.1 *2epub.1 *2od?.1 %{buildroot}/%{_mandir}/man1 %{_bindir}/pages2epub %{_bindir}/pmd2epub %{_bindir}/pub2epub +%{_bindir}/qxp2epub +%{_bindir}/sd2epub %{_bindir}/vsd2epub %{_bindir}/vss2epub %{_bindir}/wpd2epub +%{_bindir}/wpft2epub %{_bindir}/wpg2epub %{_bindir}/wps2epub +%{_bindir}/zmf2epub %{_mandir}/man1/abw2epub.1* %{_mandir}/man1/cdr2epub.1* %{_mandir}/man1/cmx2epub.1* @@ -161,11 +173,15 @@ install -m 0644 *2abw.1 *2epub.1 *2od?.1 %{buildroot}/%{_mandir}/man1 %{_mandir}/man1/pages2epub.1* %{_mandir}/man1/pmd2epub.1* %{_mandir}/man1/pub2epub.1* +%{_mandir}/man1/qxp2epub.1* +%{_mandir}/man1/sd2epub.1* %{_mandir}/man1/vsd2epub.1* %{_mandir}/man1/vss2epub.1* %{_mandir}/man1/wpd2epub.1* +%{_mandir}/man1/wpft2epub.1* %{_mandir}/man1/wpg2epub.1* %{_mandir}/man1/wps2epub.1* +%{_mandir}/man1/zmf2epub.1* %files abw %doc NEWS README @@ -174,16 +190,23 @@ install -m 0644 *2abw.1 *2epub.1 *2od?.1 %{buildroot}/%{_mandir}/man1 %{_bindir}/ebook2abw %{_bindir}/mwaw2abw %{_bindir}/pages2abw +%{_bindir}/sd2abw %{_bindir}/wpd2abw +%{_bindir}/wpft2abw %{_bindir}/wps2abw %{_mandir}/man1/abw2abw.1* %{_mandir}/man1/ebook2abw.1* %{_mandir}/man1/mwaw2abw.1* %{_mandir}/man1/pages2abw.1* +%{_mandir}/man1/sd2abw.1* %{_mandir}/man1/wpd2abw.1* +%{_mandir}/man1/wpft2abw.1* %{_mandir}/man1/wps2abw.1* %changelog +* Thu Dec 14 2017 David Tardon - 0.9.6-1 +- new upstream release + * Thu Aug 03 2017 Fedora Release Engineering - 0.9.5-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild