diff --git a/libcdr-0.0.14-pkgconfig.patch b/libcdr-0.0.14-pkgconfig.patch deleted file mode 100644 index e54400c..0000000 --- a/libcdr-0.0.14-pkgconfig.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libcdr-0.0.14/libcdr.pc.in 2012-03-02 18:04:51.000000000 +0100 -+++ libcdr-0.0.14/libcdr.pc.in 2013-10-08 16:56:29.483193618 +0200 -@@ -6,6 +6,6 @@ - Name: libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@ - Description: Library for parsing the Corel Draw file format structure - Version: @VERSION@ --Requires: libwpd-0.9 libwpd-stream-0.9 libwpg-0.2 lcms2 --Libs: -L${libdir} -lcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@ -lz -+Requires: libwpd-0.9 libwpd-stream-0.9 libwpg-0.2 -+Libs: -L${libdir} -lcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@ - Cflags: -I${includedir}/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@ diff --git a/libcdr-0.0.14-wpx_seek_end.patch b/libcdr-0.0.14-wpx_seek_end.patch deleted file mode 100644 index 9f7e3a2..0000000 --- a/libcdr-0.0.14-wpx_seek_end.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/src/lib/CDRZipStream.cpp -+++ b/src/lib/CDRZipStream.cpp -@@ -160,11 +160,7 @@ WPXInputStream *libcdr::CDRZipStream::getDocumentOLEStream(const char *name) - - bool libcdr::CDRZipStreamImpl::findCentralDirectoryEnd() - { --#if defined(LIBWPD_STREAM_VERSION_MAJOR) && defined(LIBWPD_STREAM_VERSION_MINOR) && defined(LIBWPD_STREAM_VERSION_REVISION) \ -- && (LIBWPD_STREAM_VERSION_MAJOR > 0 || (LIBWPD_STREAM_VERSION_MAJOR == 0 && (LIBWPD_STREAM_VERSION_MINOR > 9 \ -- || (LIBWPD_STREAM_VERSION_MINOR == 9 && LIBWPD_STREAM_VERSION_REVISION >= 5)))) - if (m_cdir_offset || m_input->seek(-1024, WPX_SEEK_END)) --#endif - m_input->seek(m_cdir_offset, WPX_SEEK_SET); - try - { diff --git a/libcdr-0.0.14.tar.xz b/libcdr-0.0.14.tar.xz deleted file mode 100644 index 0a32f84..0000000 --- a/libcdr-0.0.14.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:720b693ba5e777f099f41ecd40418a16674ab29d823f7d62a23be170781dd8a0 -size 570728 diff --git a/libcdr-0.0.15.tar.xz b/libcdr-0.0.15.tar.xz new file mode 100644 index 0000000..2d53c28 --- /dev/null +++ b/libcdr-0.0.15.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2d5fd934d5c8eaafd07ae71321302db632dfcb617c80c3202efc0882c9ce5cab +size 579376 diff --git a/libcdr.changes b/libcdr.changes index ea4ad1b..30ffa97 100644 --- a/libcdr.changes +++ b/libcdr.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Tue Apr 8 07:42:45 UTC 2014 - fstrba@suse.com + +- Update to upstream version 0.0.15 + * Approximation of splines by cubic beziers + * Support CorelDraw x7 file-format + * Add a palette #0x03 for spot colours (0x19) + * first iteration of YIQ255 support + * hard-depend on libwpd >= 0.9.5 + * settle license on MPL-2.0 +- Removed unneeded patches: + * libcdr-0.0.14-pkgconfig.patch + * libcdr-0.0.14-wpx_seek_end.patch + ------------------------------------------------------------------- Sat Jan 25 21:27:54 UTC 2014 - tchvatal@suse.com diff --git a/libcdr.spec b/libcdr.spec index d276dfa..6bc8db7 100644 --- a/libcdr.spec +++ b/libcdr.spec @@ -18,15 +18,13 @@ %define libname libcdr-0_0-0 Name: libcdr -Version: 0.0.14 +Version: 0.0.15 Release: 0 Summary: Library for parsing the Corel Draw file format structure -License: LGPL-2.0+ or GPL-2.0+ or MPL-1.1 +License: MPL-2.0 Group: Productivity/Publishing/Word Url: http://www.freedesktop.org/wiki/Software/libcdr Source0: http://dev-www.libreoffice.org/src/libcdr-%{version}.tar.xz -Patch0: libcdr-0.0.14-wpx_seek_end.patch -Patch1: libcdr-0.0.14-pkgconfig.patch # note: the main package is empty, it only sets a sane name for the source rpm BuildRequires: boost-devel BuildRequires: doxygen @@ -84,8 +82,6 @@ Tools to work with documents in Corel Draw file-format. %prep %setup -q -%patch0 -p1 -b .wpx_seek_end -%patch1 -p1 -b .pkgconfig %build export CXXFLAGS="%{optflags} -fvisibility-inlines-hidden"