dtardon pushed to writerperfect (master). "new upstream release 0.9.4"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed May 20 18:12:33 UTC 2015
From 015f03dab04c8febdb0f636c8162f5d93afbdbb1 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon at redhat.com>
Date: Sun, 17 May 2015 14:27:55 +0200
Subject: new upstream release 0.9.4
diff --git a/.gitignore b/.gitignore
index 230484f..234f28d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/writerperfect-0.9.0.tar.xz
/writerperfect-0.9.1.tar.xz
/writerperfect-0.9.2.tar.xz
+/writerperfect-0.9.4.tar.xz
diff --git a/0001-fix-copypasta.patch b/0001-fix-copypasta.patch
new file mode 100644
index 0000000..89f7146
--- /dev/null
+++ b/0001-fix-copypasta.patch
@@ -0,0 +1,25 @@
+From 3f340a3bc6cf81ee8f84a1e6e297b6000ae47944 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon at redhat.com>
+Date: Tue, 19 May 2015 09:56:57 +0200
+Subject: [PATCH] fix copypasta
+
+---
+ src/odf/numbers2ods.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/odf/numbers2ods.cxx b/src/odf/numbers2ods.cxx
+index 678d31c..107d9ed 100644
+--- a/src/odf/numbers2ods.cxx
++++ b/src/odf/numbers2ods.cxx
+@@ -45,7 +45,7 @@ public:
+
+ bool convertDocument(librevenge::RVNGInputStream &input, bool isFlat)
+ {
+- OdtGenerator collector;
++ OdsGenerator collector;
+ StringDocumentHandler stylesHandler, contentHandler, manifestHandler, metaHandler;
+ if (isFlat)
+ collector.addDocumentHandler(&contentHandler, ODF_FLAT_XML);
+--
+2.4.0
+
diff --git a/sources b/sources
index 574b858..14c1707 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2ae8b25f99054964a968e0a908475840 writerperfect-0.9.2.tar.xz
+bc1b90a4d4b0184a078bf5ceb9b36fda writerperfect-0.9.4.tar.xz
diff --git a/writerperfect.spec b/writerperfect.spec
index 3d924be..0193204 100644
--- a/writerperfect.spec
+++ b/writerperfect.spec
@@ -1,6 +1,6 @@
Name: writerperfect
-Version: 0.9.2
-Release: 5%{?dist}
+Version: 0.9.4
+Release: 1%{?dist}
Summary: A collection of tools to transform various file formats into ODF
License: MPLv2.0 or LGPLv2+
@@ -25,7 +25,9 @@ BuildRequires: pkgconfig(librevenge-0.0)
BuildRequires: pkgconfig(libvisio-0.1)
BuildRequires: pkgconfig(libwpd-0.10)
BuildRequires: pkgconfig(libwpg-0.3)
-BuildRequires: pkgconfig(libwps-0.3)
+BuildRequires: pkgconfig(libwps-0.4)
+
+Patch0: 0001-fix-copypasta.patch
%description
%{name} is a collection of command-line tools to transform various document
@@ -55,65 +57,56 @@ formats into EPUB. Among supported input formats are:
* Microsoft Works
%prep
-%setup -q
+%autosetup -p1
%build
%configure \
--disable-silent-rules \
--disable-werror \
- --with-libabw \
- --with-libcdr \
- --with-libe-book \
+ --with-import-libs \
+ --with-export-libs \
+ --without-librvngabw \
--with-libeot \
- --with-libepubgen \
- --with-libetonyek \
- --with-libfreehand \
- --with-libgsf \
- --with-libmspub \
- --with-libmwaw \
- --with-libpagemaker \
- --with-libvisio \
- --with-libwps
+ --with-libgsf
make %{?_smp_mflags}
-export LD_LIBRARY_PATH=`pwd`/src/lib/.libs${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
-help2man -N --no-discard-stderr -n 'convert AbiWord document into EPUB' -o abw2epub.1 ./src/abw2epub
-help2man -N --no-discard-stderr -n 'convert AbiWord document into ODF' -o abw2odt.1 ./src/abw2odt
-help2man -N --no-discard-stderr -n 'convert Corel Presentation Exchange file into EPUB' -o cmx2epub.1 ./src/cmx2epub
-help2man -N --no-discard-stderr -n 'convert Corel Presentation Exchange file into ODF' -o cmx2odg.1 ./src/cmx2odg
-help2man -N --no-discard-stderr -n 'convert CorelDRAW document into EPUB' -o cdr2epub.1 ./src/cdr2epub
-help2man -N --no-discard-stderr -n 'convert CorelDRAW document into ODF' -o cdr2odg.1 ./src/cdr2odg
-help2man -N --no-discard-stderr -n 'convert FreeHand document into EPUB' -o fh2epub.1 ./src/fh2epub
-help2man -N --no-discard-stderr -n 'convert FreeHand document into ODF' -o fh2odg.1 ./src/fh2odg
-help2man -N --no-discard-stderr -n 'convert Keynote presentation into EPUB' -o key2epub.1 ./src/key2epub
-help2man -N --no-discard-stderr -n 'convert Keynote presentation into ODF' -o key2odp.1 ./src/key2odp
-help2man -N --no-discard-stderr -n 'convert Mac document into EPUB' -o mwaw2epub.1 ./src/mwaw2epub
-help2man -N --no-discard-stderr -n 'convert Mac document into ODF' -o mwaw2odf.1 ./src/mwaw2odf
-help2man -N --no-discard-stderr -n 'convert PageMaker document into EPUB' -o pmd2epub.1 ./src/pmd2epub
-help2man -N --no-discard-stderr -n 'convert PageMaker document into ODF' -o pmd2odg.1 ./src/pmd2odg
-help2man -N --no-discard-stderr -n 'convert Publisher document into EPUB' -o pub2epub.1 ./src/pub2epub
-help2man -N --no-discard-stderr -n 'convert Publisher document into ODF' -o pub2odg.1 ./src/pub2odg
-help2man -N --no-discard-stderr -n 'convert Visio document into EPUB' -o vsd2epub.1 ./src/vsd2epub
-help2man -N --no-discard-stderr -n 'convert Visio document into ODF' -o vsd2odg.1 ./src/vsd2odg
-help2man -N --no-discard-stderr -n 'convert Visio stencil into EPUB' -o vss2epub.1 ./src/vss2epub
-help2man -N --no-discard-stderr -n 'convert Visio stencil into ODF' -o vss2odg.1 ./src/vss2odg
-help2man -N --no-discard-stderr -n 'convert WordPerfect document into EPUB' -o wpd2epub.1 ./src/wpd2epub
-help2man -N --no-discard-stderr -n 'convert WordPerfect document into ODF' -o wpd2odt.1 ./src/wpd2odt
-help2man -N --no-discard-stderr -n 'convert WordPerfect graphics into EPUB' -o wpg2epub.1 ./src/wpg2epub
-help2man -N --no-discard-stderr -n 'convert WordPerfect graphics into ODF' -o wpg2odg.1 ./src/wpg2odg
-help2man -N --no-discard-stderr -n 'convert Works document into EPUB' -o wps2epub.1 ./src/wps2epub
-help2man -N --no-discard-stderr -n 'convert Works document into ODF' -o wps2odt.1 ./src/wps2odt
-help2man -N --no-discard-stderr -n 'convert Works spreadsheet into ODF' -o wks2ods.1 ./src/wks2ods
-help2man -N --no-discard-stderr -n 'convert e-book into EPUB' -o ebook2epub.1 ./src/ebook2epub
-help2man -N --no-discard-stderr -n 'convert e-book into ODF' -o ebook2odt.1 ./src/ebook2odt
+help2man -N --no-discard-stderr -n 'convert AbiWord document into EPUB' -o abw2epub.1 ./src/epub/abw2epub
+help2man -N --no-discard-stderr -n 'convert AbiWord document into ODF' -o abw2odt.1 ./src/odf/abw2odt
+help2man -N --no-discard-stderr -n 'convert Corel Presentation Exchange file into EPUB' -o cmx2epub.1 ./src/epub/cmx2epub
+help2man -N --no-discard-stderr -n 'convert Corel Presentation Exchange file into ODF' -o cmx2odg.1 ./src/odf/cmx2odg
+help2man -N --no-discard-stderr -n 'convert CorelDRAW document into EPUB' -o cdr2epub.1 ./src/epub/cdr2epub
+help2man -N --no-discard-stderr -n 'convert CorelDRAW document into ODF' -o cdr2odg.1 ./src/odf/cdr2odg
+help2man -N --no-discard-stderr -n 'convert FreeHand document into EPUB' -o fh2epub.1 ./src/epub/fh2epub
+help2man -N --no-discard-stderr -n 'convert FreeHand document into ODF' -o fh2odg.1 ./src/odf/fh2odg
+help2man -N --no-discard-stderr -n 'convert Keynote presentation into EPUB' -o key2epub.1 ./src/epub/key2epub
+help2man -N --no-discard-stderr -n 'convert Keynote presentation into ODF' -o key2odp.1 ./src/odf/key2odp
+help2man -N --no-discard-stderr -n 'convert Mac document into EPUB' -o mwaw2epub.1 ./src/epub/mwaw2epub
+help2man -N --no-discard-stderr -n 'convert Mac document into ODF' -o mwaw2odf.1 ./src/odf/mwaw2odf
+help2man -N --no-discard-stderr -n 'convert Numbers document into ODF' -o numbers2ods.1 ./src/odf/numbers2ods
+help2man -N --no-discard-stderr -n 'convert Pages document into EPUB' -o pages2epub.1 ./src/epub/pages2epub
+help2man -N --no-discard-stderr -n 'convert Pages document into ODF' -o pages2odt.1 ./src/odf/pages2odt
+help2man -N --no-discard-stderr -n 'convert PageMaker document into EPUB' -o pmd2epub.1 ./src/epub/pmd2epub
+help2man -N --no-discard-stderr -n 'convert PageMaker document into ODF' -o pmd2odg.1 ./src/odf/pmd2odg
+help2man -N --no-discard-stderr -n 'convert Publisher document into EPUB' -o pub2epub.1 ./src/epub/pub2epub
+help2man -N --no-discard-stderr -n 'convert Publisher document into ODF' -o pub2odg.1 ./src/odf/pub2odg
+help2man -N --no-discard-stderr -n 'convert Visio document into EPUB' -o vsd2epub.1 ./src/epub/vsd2epub
+help2man -N --no-discard-stderr -n 'convert Visio document into ODF' -o vsd2odg.1 ./src/odf/vsd2odg
+help2man -N --no-discard-stderr -n 'convert Visio stencil into EPUB' -o vss2epub.1 ./src/epub/vss2epub
+help2man -N --no-discard-stderr -n 'convert Visio stencil into ODF' -o vss2odg.1 ./src/odf/vss2odg
+help2man -N --no-discard-stderr -n 'convert WordPerfect document into EPUB' -o wpd2epub.1 ./src/epub/wpd2epub
+help2man -N --no-discard-stderr -n 'convert WordPerfect document into ODF' -o wpd2odt.1 ./src/odf/wpd2odt
+help2man -N --no-discard-stderr -n 'convert WordPerfect graphics into EPUB' -o wpg2epub.1 ./src/epub/wpg2epub
+help2man -N --no-discard-stderr -n 'convert WordPerfect graphics into ODF' -o wpg2odg.1 ./src/odf/wpg2odg
+help2man -N --no-discard-stderr -n 'convert Works document into EPUB' -o wps2epub.1 ./src/epub/wps2epub
+help2man -N --no-discard-stderr -n 'convert Works document into ODF' -o wps2odt.1 ./src/odf/wps2odt
+help2man -N --no-discard-stderr -n 'convert Works spreadsheet into ODF' -o wks2ods.1 ./src/odf/wks2ods
+help2man -N --no-discard-stderr -n 'convert e-book into EPUB' -o ebook2epub.1 ./src/epub/ebook2epub
+help2man -N --no-discard-stderr -n 'convert e-book into ODF' -o ebook2odt.1 ./src/odf/ebook2odt
%install
make install DESTDIR=%{buildroot}
-# only a skeleton currently
-rm %{buildroot}%{_bindir}/pages2epub %{buildroot}%{_bindir}/pages2odt
-
install -m 0755 -d %{buildroot}/%{_mandir}/man1
install -m 0644 *2epub.1 *2od?.1 %{buildroot}/%{_mandir}/man1
@@ -127,6 +120,8 @@ install -m 0644 *2epub.1 *2od?.1 %{buildroot}/%{_mandir}/man1
%{_bindir}/fh2odg
%{_bindir}/key2odp
%{_bindir}/mwaw2odf
+%{_bindir}/numbers2ods
+%{_bindir}/pages2odt
%{_bindir}/pmd2odg
%{_bindir}/pub2odg
%{_bindir}/vsd2odg
@@ -142,6 +137,8 @@ install -m 0644 *2epub.1 *2od?.1 %{buildroot}/%{_mandir}/man1
%{_mandir}/man1/fh2odg.1*
%{_mandir}/man1/key2odp.1*
%{_mandir}/man1/mwaw2odf.1*
+%{_mandir}/man1/numbers2ods.1*
+%{_mandir}/man1/pages2odt.1*
%{_mandir}/man1/pmd2odg.1*
%{_mandir}/man1/pub2odg.1*
%{_mandir}/man1/vsd2odg.1*
@@ -159,6 +156,7 @@ install -m 0644 *2epub.1 *2od?.1 %{buildroot}/%{_mandir}/man1
%{_bindir}/fh2epub
%{_bindir}/key2epub
%{_bindir}/mwaw2epub
+%{_bindir}/pages2epub
%{_bindir}/pmd2epub
%{_bindir}/pub2epub
%{_bindir}/vsd2epub
@@ -173,6 +171,7 @@ install -m 0644 *2epub.1 *2od?.1 %{buildroot}/%{_mandir}/man1
%{_mandir}/man1/fh2epub.1*
%{_mandir}/man1/key2epub.1*
%{_mandir}/man1/mwaw2epub.1*
+%{_mandir}/man1/pages2epub.1*
%{_mandir}/man1/pmd2epub.1*
%{_mandir}/man1/pub2epub.1*
%{_mandir}/man1/vsd2epub.1*
@@ -182,6 +181,9 @@ install -m 0644 *2epub.1 *2od?.1 %{buildroot}/%{_mandir}/man1
%{_mandir}/man1/wps2epub.1*
%changelog
+* Wed May 20 2015 David Tardon <dtardon at redhat.com> - 0.9.4-1
+- new upstream release
+
* Sat May 02 2015 Kalev Lember <kalevlember at gmail.com> - 0.9.2-5
- Rebuilt for GCC 5 C++11 ABI change
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/writerperfect.git/commit/?h=master&id=015f03dab04c8febdb0f636c8162f5d93afbdbb1
More information about the scm-commits
mailing list