forked from pool/libcdr
Accepting request 229604 from LibreOffice:Factory
- Fix mistake in licensing * 0.0.x line is still tripple LGPL-2.0+ or GPL-2.0+ or MPL-1.1 (forwarded request 229603 from fstrba) OBS-URL: https://build.opensuse.org/request/show/229604 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libcdr?expand=0&rev=13
This commit is contained in:
commit
814e4df77c
@ -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
|
|
||||||
{
|
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:720b693ba5e777f099f41ecd40418a16674ab29d823f7d62a23be170781dd8a0
|
|
||||||
size 570728
|
|
3
libcdr-0.0.15.tar.xz
Normal file
3
libcdr-0.0.15.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:2d5fd934d5c8eaafd07ae71321302db632dfcb617c80c3202efc0882c9ce5cab
|
||||||
|
size 579376
|
@ -1,3 +1,23 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Apr 10 09:51:43 UTC 2014 - fstrba@suse.com
|
||||||
|
|
||||||
|
- Fix mistake in licensing
|
||||||
|
* 0.0.x line is still tripple LGPL-2.0+ or GPL-2.0+ or MPL-1.1
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
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
|
Sat Jan 25 21:27:54 UTC 2014 - tchvatal@suse.com
|
||||||
|
|
||||||
@ -16,6 +36,12 @@ Fri Nov 1 09:09:17 UTC 2013 - tchvatal@suse.com
|
|||||||
|
|
||||||
- Remove conditionals for docs and use verbose build.
|
- Remove conditionals for docs and use verbose build.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Oct 8 14:59:07 UTC 2013 - fstrba@suse.com
|
||||||
|
|
||||||
|
- liblcms2 and zlib are compile-time dependencies only
|
||||||
|
* Add patch to remove the requirements from *.pc file
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Jul 26 07:06:40 UTC 2013 - fstrba@suse.com
|
Fri Jul 26 07:06:40 UTC 2013 - fstrba@suse.com
|
||||||
|
|
||||||
|
@ -18,14 +18,13 @@
|
|||||||
|
|
||||||
%define libname libcdr-0_0-0
|
%define libname libcdr-0_0-0
|
||||||
Name: libcdr
|
Name: libcdr
|
||||||
Version: 0.0.14
|
Version: 0.0.15
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Library for parsing the Corel Draw file format structure
|
Summary: Library for parsing the Corel Draw file format structure
|
||||||
License: LGPL-2.0+ or GPL-2.0+ or MPL-1.1
|
License: LGPL-2.0+ or GPL-2.0+ or MPL-1.1
|
||||||
Group: Productivity/Publishing/Word
|
Group: Productivity/Publishing/Word
|
||||||
Url: http://www.freedesktop.org/wiki/Software/libcdr
|
Url: http://www.freedesktop.org/wiki/Software/libcdr
|
||||||
Source0: http://dev-www.libreoffice.org/src/libcdr-%{version}.tar.xz
|
Source0: http://dev-www.libreoffice.org/src/libcdr-%{version}.tar.xz
|
||||||
Patch0: libcdr-0.0.14-wpx_seek_end.patch
|
|
||||||
# note: the main package is empty, it only sets a sane name for the source rpm
|
# note: the main package is empty, it only sets a sane name for the source rpm
|
||||||
BuildRequires: boost-devel
|
BuildRequires: boost-devel
|
||||||
BuildRequires: doxygen
|
BuildRequires: doxygen
|
||||||
@ -83,7 +82,6 @@ Tools to work with documents in Corel Draw file-format.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1 -b .wpx_seek_end
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
export CXXFLAGS="%{optflags} -fvisibility-inlines-hidden"
|
export CXXFLAGS="%{optflags} -fvisibility-inlines-hidden"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user