From 330d6f5d94a643b483eac6b23bac11d8b9df509d358cf9ca75774fe936e74544 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Mon, 2 Oct 2017 10:48:23 +0000
Subject: [PATCH] - Version update to 0.1.4:   * Fix several issues found by
 oss-fuzz.   * Require C++11 for build.   * Fix issues found by coverity.   *
 Various code cleanups.

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libcdr?expand=0&rev=55
---
 libcdr-0.1.3.tar.xz |  3 ---
 libcdr-0.1.4.tar.xz |  3 +++
 libcdr.changes      |  9 +++++++++
 libcdr.spec         | 34 +++++++++++++---------------------
 4 files changed, 25 insertions(+), 24 deletions(-)
 delete mode 100644 libcdr-0.1.3.tar.xz
 create mode 100644 libcdr-0.1.4.tar.xz

diff --git a/libcdr-0.1.3.tar.xz b/libcdr-0.1.3.tar.xz
deleted file mode 100644
index 5332dd1..0000000
--- a/libcdr-0.1.3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:66e28e502abef7f6f494ce03de037d532f5e7888cfdee62c01203c8325b33f22
-size 596772
diff --git a/libcdr-0.1.4.tar.xz b/libcdr-0.1.4.tar.xz
new file mode 100644
index 0000000..4aef0ca
--- /dev/null
+++ b/libcdr-0.1.4.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e7a7e8b00a3df5798110024d7061fe9d1c3330277d2e4fa9213294f966a4a66d
+size 609592
diff --git a/libcdr.changes b/libcdr.changes
index ad36340..64c0a38 100644
--- a/libcdr.changes
+++ b/libcdr.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Oct  2 10:47:27 UTC 2017 - tchvatal@suse.com
+
+- Version update to 0.1.4:
+  * Fix several issues found by oss-fuzz.
+  * Require C++11 for build.
+  * Fix issues found by coverity.
+  * Various code cleanups.
+
 -------------------------------------------------------------------
 Wed Feb  1 12:46:46 UTC 2017 - adam.majer@suse.de
 
diff --git a/libcdr.spec b/libcdr.spec
index 752b5d3..37cc8cb 100644
--- a/libcdr.spec
+++ b/libcdr.spec
@@ -18,34 +18,30 @@
 
 %define libname libcdr-0_1-1
 Name:           libcdr
-Version:        0.1.3
+Version:        0.1.4
 Release:        0
 Summary:        Library for parsing the Corel Draw file format structure
 License:        MPL-2.0
 Group:          Productivity/Publishing/Word
 Url:            http://www.freedesktop.org/wiki/Software/libcdr
 Source0:        http://dev-www.libreoffice.org/src/%{name}/%{name}-%{version}.tar.xz
-# note: the main package is empty, it only sets a sane name for the source rpm
 Patch0:         libcdr-0.1.1-pkgconfig.patch
+BuildRequires:  doxygen
+BuildRequires:  fdupes
+BuildRequires:  gcc-c++
+BuildRequires:  pkgconfig
+BuildRequires:  xz
+BuildRequires:  pkgconfig(cppunit)
+BuildRequires:  pkgconfig(icu-i18n)
+BuildRequires:  pkgconfig(lcms2)
+BuildRequires:  pkgconfig(librevenge-0.0)
+BuildRequires:  pkgconfig(libxml-2.0)
+BuildRequires:  pkgconfig(zlib)
 %if 0%{?suse_version} > 1325
 BuildRequires:  libboost_headers-devel
 %else
 BuildRequires:  boost-devel
 %endif
-BuildRequires:  cppunit-devel
-BuildRequires:  doxygen
-BuildRequires:  fdupes
-BuildRequires:  gcc-c++
-BuildRequires:  libicu-devel
-BuildRequires:  pkgconfig
-BuildRequires:  xz
-BuildRequires:  pkgconfig(lcms2)
-BuildRequires:  pkgconfig(librevenge-0.0)
-BuildRequires:  pkgconfig(librevenge-generators-0.0)
-BuildRequires:  pkgconfig(librevenge-stream-0.0)
-BuildRequires:  pkgconfig(libxml-2.0)
-BuildRequires:  pkgconfig(zlib)
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 libcdr is a library for parsing the Corel Draw file format structure. It is
@@ -99,7 +95,7 @@ export CXXFLAGS="%{optflags} -fvisibility-inlines-hidden"
 make %{?_smp_mflags}
 
 %install
-make %{?_smp_mflags} DESTDIR=%{buildroot} install
+%make_install
 find %{buildroot} -type f -name "*.la" -delete -print
 # documentation
 mkdir -p %{buildroot}%{_docdir}/%{name}
@@ -111,22 +107,18 @@ cp -p AUTHORS COPYING.* ChangeLog %{buildroot}%{_docdir}/%{name}
 %postun -n %{libname} -p /sbin/ldconfig
 
 %files -n %{libname}
-%defattr(-,root,root)
 %{_libdir}/*.so.*
 
 %files devel
-%defattr(-,root,root)
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/libcdr*.pc
 %{_includedir}/libcdr-*
 
 %files devel-doc
-%defattr(-,root,root,-)
 %doc %dir %{_docdir}/%{name}
 %doc %{_docdir}/%{name}/html
 
 %files tools
-%defattr(-,root,root)
 %{_bindir}/*
 %doc %dir %{_docdir}/%{name}
 %doc %{_docdir}/%{name}/[A-Z]*