From 35d4a057b2296632f521c408d60d8d73194fa2a3a56d6d5d8999ca9469c2980b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Fri, 1 Nov 2013 09:09:24 +0000
Subject: [PATCH] - Remove conditonals for docs and use verbose build.

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libcdr?expand=0&rev=19
---
 libcdr.changes |  5 +++++
 libcdr.spec    | 22 +++++-----------------
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/libcdr.changes b/libcdr.changes
index 02da410..8ea9acc 100644
--- a/libcdr.changes
+++ b/libcdr.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Nov  1 09:09:17 UTC 2013 - tchvatal@suse.com
+
+- Remove conditonals for docs and use verbose build.
+
 -------------------------------------------------------------------
 Fri Jul 26 07:06:40 UTC 2013 - fstrba@suse.com
 
diff --git a/libcdr.spec b/libcdr.spec
index 372e8ed..3f81f03 100644
--- a/libcdr.spec
+++ b/libcdr.spec
@@ -19,12 +19,7 @@
 Name:           libcdr
 # note: the main package is empty, it only sets a sane name for the source rpm
 BuildRequires:  boost-devel
-%if 0%{?suse_version} > 1020
-%define build_doc	1
 BuildRequires:  doxygen
-%else
-%define build_doc	0
-%endif
 BuildRequires:  gcc-c++
 BuildRequires:  libicu-devel
 BuildRequires:  liblcms2-devel
@@ -72,8 +67,6 @@ cross-platform, at the moment it can be build on Microsoft Windows and Linux.
 This package contains the libcdr development files.
 
 
-%if %build_doc
-
 %package devel-doc
 Summary:        Documentation for the libcdr API
 Group:          Documentation/HTML
@@ -81,8 +74,6 @@ Group:          Documentation/HTML
 %description devel-doc
 This package contains documentation for the libcdr API.
 
-%endif
-
 %package tools
 Summary:        Tools to work with documents in Corel Draw file-format
 Group:          Productivity/Publishing/Word
@@ -97,14 +88,14 @@ Tools to work with documents in Corel Draw file-format.
 
 %build
 %configure --disable-static --docdir=%_docdir/%name
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install
-rm $RPM_BUILD_ROOT%_libdir/*.la
+make DESTDIR=%{buildroot} install
+rm %{buildroot}%_libdir/*.la
 # documentation
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
-cp -p AUTHORS COPYING.* ChangeLog $RPM_BUILD_ROOT%{_docdir}/%{name}
+mkdir -p %{buildroot}%{_docdir}/%{name}
+cp -p AUTHORS COPYING.* ChangeLog %{buildroot}%{_docdir}/%{name}
 
 %post -n %libname -p /sbin/ldconfig
 
@@ -120,13 +111,10 @@ cp -p AUTHORS COPYING.* ChangeLog $RPM_BUILD_ROOT%{_docdir}/%{name}
 %{_libdir}/pkgconfig/libcdr*.pc
 %{_includedir}/libcdr-*
 
-%if %build_doc != 0
-
 %files devel-doc
 %defattr(-,root,root,-)
 %doc %dir %{_docdir}/%{name}
 %doc %{_docdir}/%{name}/html
-%endif
 
 %files tools
 %defattr(-,root,root)