Accepting request 305625 from LibreOffice:Factory

Cumulated patches to build with gcc5

OBS-URL: https://build.opensuse.org/request/show/305625
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/cmis-client?expand=0&rev=29

0002-avoid-use-after-delete.patch

@@ -0,0 +1,25 @@
+From 58130d0f774242da1177ae2f77a711e7aaa8ab7d Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Thu, 26 Feb 2015 14:48:27 +0100
+Subject: [PATCH 2/2] avoid use-after-delete
+
+---
+ qa/mockup/mockup-config.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/qa/mockup/mockup-config.cxx b/qa/mockup/mockup-config.cxx
+index 7918cef..01fec24 100644
+--- a/qa/mockup/mockup-config.cxx
++++ b/qa/mockup/mockup-config.cxx
+@@ -49,7 +49,7 @@ namespace
+         }
+     }
+ 
+-    const char** lcl_toStringArray( vector< string > vect )
++    const char** lcl_toStringArray( const vector< string >& vect )
+     {
+         const char** array = new const char*[vect.size() + 1];
+         for ( size_t i = 0; i < vect.size( ); i++ )
+-- 
+2.3.7
+

cmis-client.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed May  6 17:10:00 UTC 2015 - fstrba@suse.com
+
+- Added patches:
+  * 0001-fix-boost-configuration-with-gcc-5.patch
+    - Upstream fix for boost detection with gcc5
+  * 0002-avoid-use-after-delete.patch
+    - Upstream fix for test-ws failure
+- Removed patch:
+  * fix-boost-with-gcc5.patch
+    - Superseded by the two previous patches
+
 -------------------------------------------------------------------
 Wed May  6 15:05:04 UTC 2015 - coolo@suse.com
 

cmis-client.spec

@@ -27,7 +27,10 @@ License:        MPL-1.1 or GPL-2.0+ or LGPL-2.1+
 Group:          Development/Libraries/C and C++
 Url:            http://sourceforge.net/projects/libcmis/
 Source0:        http://downloads.sourceforge.net/project/libcmis/%{_name}-%{version}.tar.gz
-Patch0:         fix-boost-with-gcc5.patch
+# Upstream patch to fix building with gcc5
+Patch0:         0001-fix-boost-configuration-with-gcc-5.patch
+# Upstream patch to fix test failures with gcc5
+Patch1:         0002-avoid-use-after-delete.patch
 
 BuildRequires:  boost-devel >= 1.42
 BuildRequires:  docbook2X
@@ -83,9 +86,13 @@ This allows C applications to connect to any CMIS-enabled repositories. It is on
 %prep
 %setup -q -n %{_name}-%{version}
 %patch0 -p1
-autoreconf -f -i
+%patch1 -p1
 
 %build
+libtoolize --force --copy
+aclocal -I m4
+automake -a -c --foreign
+autoconf
 export CFLAGS="%{optflags} -D_GNU_SOURCE $(getconf LFS_CFLAGS)"
 export CXXFLAGS="%{optflags} $(getconf LFS_CFLAGS)"
 %configure \