From cd4fe613a1906e5abcfe1555b4b229bfccce622b Mon Sep 17 00:00:00 2001 From: David Tardon Date: Mon, 4 Nov 2013 09:49:08 +0100 Subject: [PATCH] new release --- .gitignore | 1 + 0001-If-test-fails-change-test.patch | 26 --------- 0001-clean-up-forgotten-refs-to-libwpg.patch | 60 -------------------- libetonyek.spec | 13 ++--- sources | 2 +- 5 files changed, 7 insertions(+), 95 deletions(-) delete mode 100644 0001-If-test-fails-change-test.patch delete mode 100644 0001-clean-up-forgotten-refs-to-libwpg.patch diff --git a/.gitignore b/.gitignore index 35d05e5..5ff3ad6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /libetonyek-0.0.0.tar.xz +/libetonyek-0.0.1.tar.xz diff --git a/0001-If-test-fails-change-test.patch b/0001-If-test-fails-change-test.patch deleted file mode 100644 index 4826a1b..0000000 --- a/0001-If-test-fails-change-test.patch +++ /dev/null @@ -1,26 +0,0 @@ -From bf1ef59d354a49c842f1864b532f74fc90f71251 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fridrich=20=C5=A0trba?= -Date: Thu, 31 Oct 2013 07:24:45 +0100 -Subject: [PATCH] If test fails, change test! - -Change-Id: Ib31f65b7ef8c6a79bdc198be0bfab922ff1edebf ---- - src/test/KEYPathTest.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/test/KEYPathTest.cpp b/src/test/KEYPathTest.cpp -index 606eab6..482abcf 100644 ---- a/src/test/KEYPathTest.cpp -+++ b/src/test/KEYPathTest.cpp -@@ -204,7 +204,7 @@ void KEYPathTest::testConversion() - } - - { -- const string ref = "M 0 0 L 1 0 L 1 1 L 0 1 Z L 0 0"; -+ const string ref = "M 0 0 L 1 0 L 1 1 L 0 1 L 0 0 Z"; - KEYPath path; - path.appendMoveTo(0, 0); - path.appendLineTo(1, 0); --- -1.8.3.1 - diff --git a/0001-clean-up-forgotten-refs-to-libwpg.patch b/0001-clean-up-forgotten-refs-to-libwpg.patch deleted file mode 100644 index 842a0b0..0000000 --- a/0001-clean-up-forgotten-refs-to-libwpg.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 487a852b57073477ebae13bfd84bddbb50cf2505 Mon Sep 17 00:00:00 2001 -From: David Tardon -Date: Wed, 30 Oct 2013 18:46:25 +0100 -Subject: [PATCH] clean up forgotten refs to libwpg - ---- - libetonyek.pc.in | 2 +- - src/lib/KEYCollector.h | 7 ------- - src/lib/KEYObject.h | 5 ----- - 3 files changed, 1 insertion(+), 13 deletions(-) - -diff --git a/libetonyek.pc.in b/libetonyek.pc.in -index 74272a3..0439004 100644 ---- a/libetonyek.pc.in -+++ b/libetonyek.pc.in -@@ -6,6 +6,6 @@ includedir=@includedir@ - Name: libetonyek-@ETONYEK_MAJOR_VERSION@.@ETONYEK_MINOR_VERSION@ - Description: Library for parsing Apple Keynote file format structure - Version: @VERSION@ --Requires: libwpd-0.9 libwpd-stream-0.9 libwpg-0.2 -+Requires: libwpd-0.9 libwpd-stream-0.9 - Libs: -L${libdir} -letonyek-@ETONYEK_MAJOR_VERSION@.@ETONYEK_MINOR_VERSION@ - Cflags: -I${includedir}/libetonyek-@ETONYEK_MAJOR_VERSION@.@ETONYEK_MINOR_VERSION@ -diff --git a/src/lib/KEYCollector.h b/src/lib/KEYCollector.h -index c43df9d..f45bc33 100644 ---- a/src/lib/KEYCollector.h -+++ b/src/lib/KEYCollector.h -@@ -18,13 +18,6 @@ - #include "KEYPath_fwd.h" - #include "KEYTypes_fwd.h" - --namespace libwpg --{ -- --class WPGPaintInterface; -- --} // namespace libwpg -- - namespace libetonyek - { - -diff --git a/src/lib/KEYObject.h b/src/lib/KEYObject.h -index 0249ee6..6a51d68 100644 ---- a/src/lib/KEYObject.h -+++ b/src/lib/KEYObject.h -@@ -14,11 +14,6 @@ - - #include - --namespace libwpg --{ --class WPGPaintInterface; --} -- - namespace libetonyek - { - --- -1.8.3.1 - diff --git a/libetonyek.spec b/libetonyek.spec index 034aeb8..2de82dd 100644 --- a/libetonyek.spec +++ b/libetonyek.spec @@ -1,7 +1,7 @@ %global apiversion 0.0 Name: libetonyek -Version: 0.0.0 +Version: 0.0.1 Release: 1%{?dist} Summary: A library for import of Apple Keynote presentations @@ -18,9 +18,6 @@ BuildRequires: libwpd-devel BuildRequires: libxml2-devel BuildRequires: zlib-devel -Patch0: 0001-clean-up-forgotten-refs-to-libwpg.patch -Patch1: 0001-If-test-fails-change-test.patch - %description libetonyek is library providing ability to interpret and import Apple Keynote presentations into various applications. Only version 5 is @@ -55,9 +52,6 @@ Currently supported: XHTML, raw, text. %prep %setup -q -%patch0 -p1 -%patch1 -p1 - %build %configure --disable-silent-rules --disable-static --disable-werror sed -i \ @@ -81,7 +75,7 @@ export LD_LIBRARY_PATH=%{buildroot}/%{_libdir}${LD_LIBRARY_PATH:+:${LD_LIBRARY_P make %{?_smp_mflags} check %files -%doc AUTHORS COPYING NEWS README +%doc AUTHORS COPYING FEATURES NEWS README %{_libdir}/%{name}-%{apiversion}.so.* %files devel @@ -100,5 +94,8 @@ make %{?_smp_mflags} check %{_bindir}/key2xhtml %changelog +* Mon Nov 04 2013 David Tardon - 0.0.1-1 +- new release + * Wed Oct 30 2013 David Tardon 0.0.0-1 - initial import diff --git a/sources b/sources index 4c65e81..eb9b981 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4336c8e0a54bc4c8090b66945fcc715a libetonyek-0.0.0.tar.xz +196da9f46499382d9514e43a4a4bf4ff libetonyek-0.0.1.tar.xz