David Tardon
11 years ago
parent
eea06a49fa
commit
a0075c6c70
@ -0,0 +1 @@
|
|||||||
|
/libetonyek-0.0.0.tar.xz
|
||||||
@ -0,0 +1,26 @@
|
|||||||
|
From bf1ef59d354a49c842f1864b532f74fc90f71251 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
|
||||||
|
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
|
||||||
|
|
||||||
@ -0,0 +1,60 @@
|
|||||||
|
From 487a852b57073477ebae13bfd84bddbb50cf2505 Mon Sep 17 00:00:00 2001
|
||||||
|
From: David Tardon <dtardon@redhat.com>
|
||||||
|
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 <boost/shared_ptr.hpp>
|
||||||
|
|
||||||
|
-namespace libwpg
|
||||||
|
-{
|
||||||
|
-class WPGPaintInterface;
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
namespace libetonyek
|
||||||
|
{
|
||||||
|
|
||||||
|
--
|
||||||
|
1.8.3.1
|
||||||
|
|
||||||
@ -0,0 +1,105 @@
|
|||||||
|
%global apiversion 0.0
|
||||||
|
|
||||||
|
Name: libetonyek
|
||||||
|
Version: 0.0.0
|
||||||
|
Release: 1%{?dist}
|
||||||
|
Summary: A library for import of Apple Keynote presentations
|
||||||
|
|
||||||
|
Group: System Environment/Libraries
|
||||||
|
License: MPLv2.0
|
||||||
|
# there is no regular homepage yet...
|
||||||
|
URL: http://www.libreoffice.org/default/
|
||||||
|
Source: http://dev-www.libreoffice.org/src/%{name}-%{version}.tar.xz
|
||||||
|
|
||||||
|
BuildRequires: cppunit-devel
|
||||||
|
BuildRequires: boost-devel
|
||||||
|
BuildRequires: doxygen
|
||||||
|
BuildRequires: gperf
|
||||||
|
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
|
||||||
|
supported at the moment, although versions 2-4 should work.
|
||||||
|
|
||||||
|
%package devel
|
||||||
|
Summary: Development files for %{name}
|
||||||
|
Group: Development/Libraries
|
||||||
|
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||||
|
|
||||||
|
%description devel
|
||||||
|
The %{name}-devel package contains libraries and header files for
|
||||||
|
developing applications that use %{name}.
|
||||||
|
|
||||||
|
%package doc
|
||||||
|
Summary: Documentation of %{name} API
|
||||||
|
Group: Documentation
|
||||||
|
BuildArch: noarch
|
||||||
|
|
||||||
|
%description doc
|
||||||
|
The %{name}-doc package contains documentation files for %{name}.
|
||||||
|
|
||||||
|
%package tools
|
||||||
|
Summary: Tools to transform Apple Keynote presentations into other formats
|
||||||
|
Group: Applications/Publishing
|
||||||
|
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||||
|
|
||||||
|
%description tools
|
||||||
|
Tools to transform Apple Keynote presentations into other formats.
|
||||||
|
Currently supported: XHTML, raw, text.
|
||||||
|
|
||||||
|
%prep
|
||||||
|
%setup -q
|
||||||
|
|
||||||
|
%patch0 -p1
|
||||||
|
%patch1 -p1
|
||||||
|
|
||||||
|
%build
|
||||||
|
%configure --disable-silent-rules --disable-static --disable-werror
|
||||||
|
sed -i \
|
||||||
|
-e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
|
||||||
|
-e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \
|
||||||
|
libtool
|
||||||
|
make %{?_smp_mflags}
|
||||||
|
|
||||||
|
%install
|
||||||
|
make install DESTDIR=%{buildroot}
|
||||||
|
rm -f %{buildroot}/%{_libdir}/*.la
|
||||||
|
# we install API docs directly from build
|
||||||
|
rm -rf %{buildroot}/%{_docdir}/%{name}
|
||||||
|
|
||||||
|
%post -p /sbin/ldconfig
|
||||||
|
|
||||||
|
%postun -p /sbin/ldconfig
|
||||||
|
|
||||||
|
%check
|
||||||
|
export LD_LIBRARY_PATH=%{buildroot}/%{_libdir}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
|
||||||
|
make %{?_smp_mflags} check
|
||||||
|
|
||||||
|
%files
|
||||||
|
%doc AUTHORS COPYING NEWS README
|
||||||
|
%{_libdir}/%{name}-%{apiversion}.so.*
|
||||||
|
|
||||||
|
%files devel
|
||||||
|
%doc ChangeLog
|
||||||
|
%{_includedir}/%{name}-%{apiversion}
|
||||||
|
%{_libdir}/%{name}-%{apiversion}.so
|
||||||
|
%{_libdir}/pkgconfig/%{name}-%{apiversion}.pc
|
||||||
|
|
||||||
|
%files doc
|
||||||
|
%doc COPYING
|
||||||
|
%doc docs/doxygen/html
|
||||||
|
|
||||||
|
%files tools
|
||||||
|
%{_bindir}/key2raw
|
||||||
|
%{_bindir}/key2text
|
||||||
|
%{_bindir}/key2xhtml
|
||||||
|
|
||||||
|
%changelog
|
||||||
|
* Wed Oct 30 2013 David Tardon <dtardon@redhat.com> 0.0.0-1
|
||||||
|
- initial import
|
||||||
Loading…
Reference in new issue