From 46aa66e5fdf2930b1bd86884806857c479097661662d20fa88c466e04b5cd3de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Sun, 8 May 2016 10:19:22 +0000
Subject: [PATCH] - Version update to 1.3.4:   * Various updates to the
 buildsystem   * Various werror bugfixes   * Loads of coverity fixes - Add
 patch to build with grep 2.24:   * hunspell-grep2.24.patch - Remove
 upstreamed patch:   * hunspell-emacs-utf8.patch - Do not search for
 translations - broken automake from upstream   * Not worth fixing only bit
 italian and mostly hungarian translations     for cli anyway

OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/cmis-client?expand=0&rev=36
---
 cmis-client.changes            |  6 ++++++
 cmis-client.spec               | 28 +++++++++++++---------------
 declare-automake-foreign.patch | 13 +++++++++++++
 3 files changed, 32 insertions(+), 15 deletions(-)
 create mode 100644 declare-automake-foreign.patch

diff --git a/cmis-client.changes b/cmis-client.changes
index c8cc64f..297f507 100644
--- a/cmis-client.changes
+++ b/cmis-client.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun May  8 10:18:47 UTC 2016 - tchvatal@suse.com
+
+- Simplify autoreconf call and add patch to mark Makefile as foreign:
+  * declare-automake-foreign.patch
+
 -------------------------------------------------------------------
 Fri Mar  4 13:36:58 UTC 2016 - tchvatal@suse.com
 
diff --git a/cmis-client.spec b/cmis-client.spec
index 90d3fb7..90b0628 100644
--- a/cmis-client.spec
+++ b/cmis-client.spec
@@ -26,17 +26,19 @@ Summary:        Sample CMIS client
 License:        MPL-1.1 or GPL-2.0+ or LGPL-2.1+
 Group:          Development/Libraries/C and C++
 Url:            https://github.com/tdf/libcmis
-Source0:        https://github.com/tdf/%_name/releases/download/v%{version}/%_name-%{version}.tar.gz
-BuildRequires:  boost-devel >= 1.42
+Source0:        https://github.com/tdf/%{_name}/releases/download/v%{version}/%{_name}-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM: declare automake foreign
+Patch0:         declare-automake-foreign.patch
+BuildRequires:  boost-devel >= 1.36
 BuildRequires:  docbook2X
 BuildRequires:  gcc-c++
 BuildRequires:  intltool
 BuildRequires:  libcppunit-devel
-BuildRequires:  libcurl-devel
 BuildRequires:  libtool
-BuildRequires:  libxml2-devel
 BuildRequires:  libxslt
-BuildRequires:  pkg-config
+BuildRequires:  pkgconfig
+BuildRequires:  pkgconfig(libcurl)
+BuildRequires:  pkgconfig(libxml-2.0)
 Requires:       %{_name}-%{soname} = %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -80,22 +82,21 @@ This allows C applications to connect to any CMIS-enabled repositories. It is on
 
 %prep
 %setup -q -n %{_name}-%{version}
+%patch0 -p1
 
 %build
-libtoolize --force --copy
-aclocal -I m4
-automake -a -c --foreign
-autoconf
+autoreconf -fvi
 export CFLAGS="%{optflags} -D_GNU_SOURCE $(getconf LFS_CFLAGS)"
 export CXXFLAGS="%{optflags} $(getconf LFS_CFLAGS)"
 %configure \
+    --disable-silent-rules \
     --disable-long-tests \
     --disable-static \
     --disable-werror
-make %{?_smp_mflags} V=1
+make %{?_smp_mflags}
 
 %install
-make DESTDIR=%{buildroot} install %{?_smp_mflags}
+make %{?_smp_mflags} DESTDIR=%{buildroot} install
 find %{buildroot} -type f -name "*.la" -delete -print
 
 %check
@@ -107,17 +108,14 @@ make check %{?_smp_mflags}
 %endif
 
 %post -n %{_name}-%{soname} -p /sbin/ldconfig
-
 %post -n %{_name}-c-%{soname} -p /sbin/ldconfig
-
 %postun -n %{_name}-%{soname} -p /sbin/ldconfig
-
 %postun -n %{_name}-c-%{soname} -p /sbin/ldconfig
 
 %files
 %defattr(-, root, root)
 %{_bindir}/cmis-client
-%doc %{_mandir}/man1/cmis-client.1.gz
+%{_mandir}/man1/cmis-client.1.*
 
 %files -n %{_name}-%{soname}
 %defattr(-, root, root)
diff --git a/declare-automake-foreign.patch b/declare-automake-foreign.patch
new file mode 100644
index 0000000..dfffd81
--- /dev/null
+++ b/declare-automake-foreign.patch
@@ -0,0 +1,13 @@
+Index: libcmis-0.5.1/configure.ac
+===================================================================
+--- libcmis-0.5.1.orig/configure.ac
++++ libcmis-0.5.1/configure.ac
+@@ -10,7 +10,7 @@ m4_define([libcmis_version],[libcmis_api
+ 
+ AC_PREREQ([2.63])
+ AC_INIT([libcmis], [libcmis_version])
+-AM_INIT_AUTOMAKE()
++AM_INIT_AUTOMAKE([1.10 foreign dist-xz])
+ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+ 
+ # Checks for programs.