From 9fc5173a9b32f0720ff50d1326faf8c46b31bca8 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Mon, 26 May 2014 17:59:23 +0200 Subject: [PATCH] new upstream release 0.1.0 --- .gitignore | 1 + ...-are-not-required-for-standard-build.patch | 42 +++++++++++++++++++ ...-based-formats-are-not-supported-yet.patch | 36 ++++++++++++++++ libe-book.spec | 30 ++++++++----- sources | 2 +- 5 files changed, 99 insertions(+), 12 deletions(-) create mode 100644 0001-libcss-et-al.-are-not-required-for-standard-build.patch create mode 100644 0002-HTML-based-formats-are-not-supported-yet.patch diff --git a/.gitignore b/.gitignore index cdfe6fd..cab4648 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /libe-book-0.0.1.tar.xz /libe-book-0.0.2.tar.xz /libe-book-0.0.3.tar.xz +/libe-book-0.1.0.tar.xz diff --git a/0001-libcss-et-al.-are-not-required-for-standard-build.patch b/0001-libcss-et-al.-are-not-required-for-standard-build.patch new file mode 100644 index 0000000..a410f4a --- /dev/null +++ b/0001-libcss-et-al.-are-not-required-for-standard-build.patch @@ -0,0 +1,42 @@ +From 8d0e919363a596c57fd228370d6929ab085be900 Mon Sep 17 00:00:00 2001 +From: David Tardon +Date: Sat, 24 May 2014 15:08:11 +0200 +Subject: [PATCH 1/2] libcss et al. are not required for standard build + +--- + README | 6 +++--- + configure.ac | 3 +++ + libe-book.pc.in | 2 +- + 3 files changed, 7 insertions(+), 4 deletions(-) + +diff --git a/README b/README +index 95752dd..e1dceeb 100644 +--- a/README ++++ b/README +@@ -20,10 +20,10 @@ Currently supported are: + + The following libraries are required for build: + - boost +-- hubbub ++- hubbub (only for --enable-experimental) + - icu +-- libcss +-- libmspack ++- libcss (only for --enable-experimental) ++- libmspack (only for --enable-experimental) + - librevenge + - libxml2 + - zlib +diff --git a/libe-book.pc.in b/libe-book.pc.in +index 3508d96..93c248f 100644 +--- a/libe-book.pc.in ++++ b/libe-book.pc.in +@@ -10,4 +10,4 @@ Requires: librevenge-0.0 librevenge-stream-0.0 + Libs: -L${libdir} -le-book-@EBOOK_MAJOR_VERSION@.@EBOOK_MINOR_VERSION@ + Cflags: -I${includedir}/libe-book-@EBOOK_MAJOR_VERSION@.@EBOOK_MINOR_VERSION@ + +-Requires.private: icu-uc libcss libhubbub libmspack libxml-2.0 zlib ++Requires.private: icu-uc libxml-2.0 zlib +-- +1.9.0 + diff --git a/0002-HTML-based-formats-are-not-supported-yet.patch b/0002-HTML-based-formats-are-not-supported-yet.patch new file mode 100644 index 0000000..a61fb03 --- /dev/null +++ b/0002-HTML-based-formats-are-not-supported-yet.patch @@ -0,0 +1,36 @@ +From 3aecef6474094f520b9df954865dc7ce15ed1870 Mon Sep 17 00:00:00 2001 +From: David Tardon +Date: Sat, 24 May 2014 15:08:44 +0200 +Subject: [PATCH 2/2] HTML-based formats are not supported yet + +--- + README | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/README b/README +index e1dceeb..7ff1dbb 100644 +--- a/README ++++ b/README +@@ -2,19 +2,13 @@ libe-book is a library and a set of tools for reading and converting + various reflowable e-book formats. + + Currently supported are: +-- ePub (v.2) + - eReader .pdb + - FictionBook v. 2 (including zipped files) +-- HTML 1(?)-5 +-- MS HTML Help + - PalmDoc Ebook + - Plucker .pdb +-- Open eBook (OEB) + - QiOO (mobile format, for java-enabled cellphones) +-- Rocket eBook + - TCR (simple compressed text format) + - TealDoc +-- XHTML 1.0 + - zTXT + - ZVR (simple compressed text format) + +-- +1.9.0 + diff --git a/libe-book.spec b/libe-book.spec index 0700eb1..8ed297b 100644 --- a/libe-book.spec +++ b/libe-book.spec @@ -1,12 +1,12 @@ -%global apiversion 0.0 +%global apiversion 0.1 Name: libe-book -Version: 0.0.3 -Release: 4%{?dist} -Summary: A library for import of non-HTML reflowable e-book formats +Version: 0.1.0 +Release: 1%{?dist} +Summary: A library for import of reflowable e-book formats Group: System Environment/Libraries -License: LGPLv2+ or MPLv2.0 +License: MPLv2.0 URL: https://sourceforge.net/projects/libebook/ Source: http://downloads.sourceforge.net/libebook/%{name}-%{version}.tar.xz @@ -16,12 +16,14 @@ BuildRequires: gperf BuildRequires: help2man BuildRequires: pkgconfig(cppunit) BuildRequires: pkgconfig(icu-i18n) -BuildRequires: pkgconfig(libwpd-0.9) -BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(librevenge-0.0) BuildRequires: pkgconfig(zlib) +Patch0: 0001-libcss-et-al.-are-not-required-for-standard-build.patch +Patch1: 0002-HTML-based-formats-are-not-supported-yet.patch + %description -%{name} is a library for import of non-HTML reflowable e-book formats. +%{name} is a library for import of reflowable e-book formats. Currently supported are PalmDoc, TealDoc, Plucker eBook, eReader eBook, FictionBook v.2, TCR, zTXT. @@ -52,7 +54,7 @@ Tools to transform e-books into other formats. Currently supported: XHTML, raw, text. %prep -%setup -q +%autosetup -p1 %build %configure --disable-silent-rules --disable-static --disable-werror @@ -73,6 +75,9 @@ rm -f %{buildroot}/%{_libdir}/*.la # we install API docs directly from build rm -rf %{buildroot}/%{_docdir}/%{name} +# TODO: drop on next update +rm -f %{buildroot}%{_datadir}/%{name}/*.css + mkdir -p %{buildroot}/%{_mandir}/man1 install -m 0644 ebook2*.1 %{buildroot}/%{_mandir}/man1 @@ -85,7 +90,7 @@ export LD_LIBRARY_PATH=%{buildroot}/%{_libdir}${LD_LIBRARY_PATH:+:${LD_LIBRARY_P make %{?_smp_mflags} check %files -%doc AUTHORS COPYING.LGPL COPYING.MPL NEWS README +%doc AUTHORS COPYING NEWS README %{_libdir}/%{name}-%{apiversion}.so.* %files devel @@ -95,7 +100,7 @@ make %{?_smp_mflags} check %{_libdir}/pkgconfig/%{name}-%{apiversion}.pc %files doc -%doc COPYING.LGPL COPYING.MPL +%doc COPYING %doc docs/doxygen/html %files tools @@ -107,6 +112,9 @@ make %{?_smp_mflags} check %{_mandir}/man1/ebook2text.1* %changelog +* Mon May 26 2014 David Tardon - 0.1.0-1 +- new upstream release 0.1.0 + * Fri May 23 2014 Petr Machata - 0.0.3-4 - Rebuild for boost 1.55.0 diff --git a/sources b/sources index 891378f..12b8f33 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cd3d71e8ad6df3d815ae977ec1ba667c libe-book-0.0.3.tar.xz +0a49e90b46193c1ae1e55ff0486b5090 libe-book-0.1.0.tar.xz