From 68200f6acb1dd4ae2ea40765fc8fb4383bc05608 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Mar 05 2015 13:09:29 +0000 Subject: import libetonyek-0.0.4-2.el7 --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..933be16 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/libetonyek-0.0.4.tar.xz diff --git a/.libetonyek.metadata b/.libetonyek.metadata new file mode 100644 index 0000000..1292e37 --- /dev/null +++ b/.libetonyek.metadata @@ -0,0 +1 @@ +e2c19f661f5f8f3a0f39c174651a407a2ee3868e SOURCES/libetonyek-0.0.4.tar.xz diff --git a/README.md b/README.md deleted file mode 100644 index 98f42b4..0000000 --- a/README.md +++ /dev/null @@ -1,4 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/0001-CID-1130378-rearrange-a-bit.patch b/SOURCES/0001-CID-1130378-rearrange-a-bit.patch new file mode 100644 index 0000000..dc78b82 --- /dev/null +++ b/SOURCES/0001-CID-1130378-rearrange-a-bit.patch @@ -0,0 +1,30 @@ +From 55968d72d1571ac34fae2a2842f5577b1300d51b Mon Sep 17 00:00:00 2001 +From: David Tardon +Date: Mon, 9 Dec 2013 11:10:15 +0100 +Subject: [PATCH] CID#1130378 rearrange a bit + +Change-Id: I2e8470ca67b8ee43f843bdd1cdc1ce949e9df05a +--- + src/lib/KEYMemoryStream.cpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/lib/KEYMemoryStream.cpp b/src/lib/KEYMemoryStream.cpp +index dfa6bbb..5fbd182 100644 +--- a/src/lib/KEYMemoryStream.cpp ++++ b/src/lib/KEYMemoryStream.cpp +@@ -166,9 +166,11 @@ void KEYMemoryStream::read(const RVNGInputStreamPtr_t &input, const unsigned len + { + if (0 == length) + return; ++ if (!bool(input)) ++ throw EndOfStreamException(); + + unsigned long readBytes = 0; +- const unsigned char *const data = bool(input) ? input->read(length, readBytes) : 0; ++ const unsigned char *const data = input->read(length, readBytes); + if (length != readBytes) + throw EndOfStreamException(); + +-- +1.9.3 + diff --git a/SOURCES/0001-add-support-for-ppc64le.patch b/SOURCES/0001-add-support-for-ppc64le.patch new file mode 100644 index 0000000..6ff71a7 --- /dev/null +++ b/SOURCES/0001-add-support-for-ppc64le.patch @@ -0,0 +1,25 @@ +From b23652d3238389aae3c6ddbaab85bc7468a3fb6a Mon Sep 17 00:00:00 2001 +From: David Tardon +Date: Thu, 28 Aug 2014 14:41:48 +0200 +Subject: [PATCH] add support for ppc64le + +--- + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure b/configure +index 79d69e2..eea430d 100755 +--- a/configure ++++ b/configure +@@ -17425,7 +17425,7 @@ $as_echo_n "checking for boostlib >= $boost_lib_version_req... " >&6; } + libsubdirs="lib" + ax_arch=`uname -m` + case $ax_arch in +- x86_64|ppc64|s390x|sparc64|aarch64) ++ x86_64|ppc64|ppc64le|s390x|sparc64|aarch64) + libsubdirs="lib64 lib lib64" + ;; + esac +-- +1.9.3 + diff --git a/SOURCES/0001-make-sure-this-is-never-called-with-0-length.patch b/SOURCES/0001-make-sure-this-is-never-called-with-0-length.patch new file mode 100644 index 0000000..733734d --- /dev/null +++ b/SOURCES/0001-make-sure-this-is-never-called-with-0-length.patch @@ -0,0 +1,54 @@ +From 8053d231c79919ae9911685f0f2e69bd7ac18e72 Mon Sep 17 00:00:00 2001 +From: David Tardon +Date: Mon, 9 Dec 2013 11:06:19 +0100 +Subject: [PATCH] make sure this is never called with 0 length + +Change-Id: Ic7726c1fbfd58ae2e0a78c203e426deedc2c461b +--- + src/lib/KEYMemoryStream.cpp | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/src/lib/KEYMemoryStream.cpp b/src/lib/KEYMemoryStream.cpp +index 4518546..dfa6bbb 100644 +--- a/src/lib/KEYMemoryStream.cpp ++++ b/src/lib/KEYMemoryStream.cpp +@@ -8,6 +8,7 @@ + */ + + #include ++#include + + #include "libetonyek_utils.h" + #include "KEYMemoryStream.h" +@@ -56,6 +57,9 @@ KEYMemoryStream::KEYMemoryStream(const unsigned char *const data, const unsigned + , m_length(length) + , m_pos(0) + { ++ if (0 == length) ++ throw GenericException(); ++ + assign(data, length); + } + +@@ -151,6 +155,8 @@ bool KEYMemoryStream::isEnd() + + void KEYMemoryStream::assign(const unsigned char *const data, const unsigned length) + { ++ assert(0 != length); ++ + unsigned char *buffer = new unsigned char[length]; + std::copy(data, data + length, buffer); + m_data = buffer; +@@ -158,6 +164,9 @@ void KEYMemoryStream::assign(const unsigned char *const data, const unsigned len + + void KEYMemoryStream::read(const RVNGInputStreamPtr_t &input, const unsigned length) + { ++ if (0 == length) ++ return; ++ + unsigned long readBytes = 0; + const unsigned char *const data = bool(input) ? input->read(length, readBytes) : 0; + if (length != readBytes) +-- +1.9.3 + diff --git a/SPECS/libetonyek.spec b/SPECS/libetonyek.spec new file mode 100644 index 0000000..e110a44 --- /dev/null +++ b/SPECS/libetonyek.spec @@ -0,0 +1,132 @@ +%global apiversion 0.0 + +Name: libetonyek +Version: 0.0.4 +Release: 2%{?dist} +Summary: A library for import of Apple Keynote presentations + +Group: System Environment/Libraries +License: MPLv2.0 +URL: http://wiki.documentfoundation.org/DLP/Libraries/libetonyek +Source: http://dev-www.libreoffice.org/src/%{name}/%{name}-%{version}.tar.xz + +BuildRequires: boost-devel +BuildRequires: doxygen +BuildRequires: gperf +BuildRequires: help2man +BuildRequires: pkgconfig(cppunit) +BuildRequires: pkgconfig(libwpd-0.9) +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(zlib) + +Patch0: 0001-add-support-for-ppc64le.patch +Patch1: 0001-make-sure-this-is-never-called-with-0-length.patch +Patch2: 0001-CID-1130378-rearrange-a-bit.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 +%autosetup -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} + +export LD_LIBRARY_PATH=`pwd`/src/lib/.libs${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} +help2man -N -n 'debug the conversion library' -o key2raw.1 ./src/conv/raw/.libs/key2raw +help2man -N -n 'convert Keynote presentation into SVG' -o key2xhtml.1 ./src/conv/svg/.libs/key2xhtml +help2man -N -n 'convert Keynote presentation into plain text' -o key2text.1 ./src/conv/text/.libs/key2text + +%install +make install DESTDIR=%{buildroot} +rm -f %{buildroot}/%{_libdir}/*.la +# we install API docs directly from build +rm -rf %{buildroot}/%{_docdir}/%{name} + +install -m 0755 -d %{buildroot}/%{_mandir}/man1 +install -m 0644 key2*.1 %{buildroot}/%{_mandir}/man1 + +%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 FEATURES 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 +%{_mandir}/man1/key2raw.1* +%{_mandir}/man1/key2text.1* +%{_mandir}/man1/key2xhtml.1* + +%changelog +* Fri Sep 12 2014 David Tardon - 0.0.4-2 +- Related: rhbz#1130553 fix coverity issue + +* Tue Apr 15 2014 David Tardon - 0.0.4-1 +- new upstream release + +* Wed Apr 09 2014 David Tardon - 0.0.3-2 +- generate man pages + +* Fri Dec 06 2013 David Tardon - 0.0.3-1 +- new release + +* Wed Dec 04 2013 David Tardon - 0.0.2-1 +- new release + +* Mon Nov 04 2013 David Tardon - 0.0.1-1 +- new release + +* Wed Oct 30 2013 David Tardon 0.0.0-1 +- initial import