- rel 6; fix boost detection with gcc 5.2

diff --git a/libcmis-boost-gcc.patch b/libcmis-boost-gcc.patch
new file mode 100644 (file)
index 0000000..7422b5d
--- /dev/null
+++ b/libcmis-boost-gcc.patch
@@ -0,0 +1,39 @@
+diff -urN libcmis-0.5.0.org/m4/boost.m4 libcmis-0.5.0/m4/boost.m4
+--- libcmis-0.5.0.org/m4/boost.m4      2014-03-28 15:19:57.000000000 +0100
++++ libcmis-0.5.0/m4/boost.m4  2015-09-21 14:42:25.149565264 +0200
+@@ -68,7 +68,9 @@
+ dnl everything else.
+ dnl Cannot use 'dnl' after [$4] because a trailing dnl may break AC_CACHE_CHECK
+ (eval "$ac_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD |
++  grep -v '#' |
+   tr -d '\r' |
++  tr -s '\n' ' ' |
+   $SED -n -e "$1" >conftest.i 2>&1],
+   [$3],
+   [$4])
+@@ -201,7 +203,7 @@
+   AC_CACHE_CHECK([for Boost's header version],
+     [boost_cv_lib_version],
+     [m4_pattern_allow([^BOOST_LIB_VERSION$])dnl
+-     _BOOST_SED_CPP([/^boost-lib-version = /{s///;s/\"//g;p;g;}],
++     _BOOST_SED_CPP([[/^boost-lib-version = /{s///;s/[\" ]//g;p;q;}]],
+                     [#include <boost/version.hpp>
+ boost-lib-version = BOOST_LIB_VERSION],
+     [boost_cv_lib_version=`cat conftest.i`])])
+@@ -209,7 +211,7 @@
+     boost_major_version=`echo "$boost_cv_lib_version" | sed 's/_//;s/_.*//'`
+     case $boost_major_version in #(
+       '' | *[[!0-9]]*)
+-        AC_MSG_ERROR([invalid value: boost_major_version=$boost_major_version])
++        AC_MSG_ERROR([invalid value: boost_major_version='$boost_major_version'])
+         ;;
+     esac
+ fi
+@@ -930,6 +932,7 @@
+   # the same defines as GCC's).
+   # TODO: Move the test on GCC 4.4 up once it's released.
+   for i in \
++    _BOOST_gcc_test(5, 2) \
+     _BOOST_gcc_test(4, 3) \
+     _BOOST_gcc_test(4, 2) \
+     _BOOST_gcc_test(4, 1) \

diff --git a/libcmis.spec b/libcmis.spec
index 42a3ad00aa743e0503ba603ad4a43d8d7b9df64d..6d92e7342c8a77462db12e9271b1a408cdbc48d6 100644 (file)
--- a/libcmis.spec
+++ b/libcmis.spec
@@ -6,11 +6,12 @@ Summary:      A C++ client library for the CMIS interface
 Summary(pl.UTF-8):     Biblioteka klienta C++ dla inferfejsu CMIS
 Name:          libcmis
 Version:       0.5.0
-Release:       5
+Release:       6
 License:       GPL v2+ or LGPL v2+ or MPL v1.1
 Group:         Libraries
 Source0:       http://downloads.sourceforge.net/libcmis/%{name}-%{version}.tar.gz
 # Source0-md5: 5821b806a98e6c38370970e682ce76e8
+Patch0:                %{name}-boost-gcc.patch
 URL:           http://sourceforge.net/projects/libcmis/
 BuildRequires: autoconf >= 2.63
 BuildRequires: automake
@@ -82,6 +83,7 @@ poleceń.
 
 %prep
 %setup -q
+%patch0 -p1
 
 #%{__sed} -i -e 's/docbook-to-man/docbook2X2man/' configure.ac