rpm/cmis-client
SHA256
1
0
Fork 0
forked from pool/cmis-client
Code Pull Requests Activity

Accepting request 629751 from home:adamm:branches:devel:libraries:c_c++

Browse Source 
- use %license to install licenses
- spec file cleanup
- boost_168.patch: fix build with Boost 1.68 where the compatibility
  header for Uuid's sha1 header was removed. (boo#1105173)

OBS-URL: https://build.opensuse.org/request/show/629751
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/cmis-client?expand=0&rev=42
This commit is contained in:
Tomáš Chvátal 2018-08-17 10:18:04 +00:00 committed by Git OBS Bridge
parent 78a310cf98
commit 0f67031f12
3 changed files with 44 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
boost_168.patch Normal file
View File

@ -0,0 +1,19 @@
Index: libcmis-0.5.1/src/libcmis/xml-utils.cxx
===================================================================
--- libcmis-0.5.1.orig/src/libcmis/xml-utils.cxx
+++ libcmis-0.5.1/src/libcmis/xml-utils.cxx
@@ -31,7 +31,14 @@
#include <sstream>
#include <stdlib.h>
+#include <boost/version.hpp>
+
+#if BOOST_VERSION >= 106800
+#include <boost/uuid/detail/sha1.hpp>
+#else
#include <boost/uuid/sha1.hpp>
+#endif
+
#include <curl/curl.h>
#include "xml-utils.hxx"

8
cmis-client.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Fri Aug 17 07:17:25 UTC 2018 - adam.majer@suse.de
- use %license to install licenses
- spec file cleanup
- boost_168.patch: fix build with Boost 1.68 where the compatibility
header for Uuid's sha1 header was removed. (boo#1105173)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Feb 8 10:09:12 UTC 2017 - jengelh@inai.de Wed Feb 8 10:09:12 UTC 2017 - jengelh@inai.de

36
cmis-client.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package cmis-client # spec file for package cmis-client
# #
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -23,18 +23,13 @@ Name: cmis-client
Version: 0.5.1 Version: 0.5.1
Release: 0 Release: 0
Summary: Sample CMIS client Summary: Sample CMIS client
License: MPL-1.1 or GPL-2.0+ or LGPL-2.1+ License: MPL-1.1 OR GPL-2.0-or-later OR LGPL-2.1-or-later
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Url: https://github.com/tdf/libcmis URL: https://github.com/tdf/libcmis
Source0: https://github.com/tdf/%{_name}/releases/download/v%{version}/%{_name}-%{version}.tar.gz Source0: https://github.com/tdf/%{_name}/releases/download/v%{version}/%{_name}-%{version}.tar.gz
# PATCH-FIX-UPSTREAM: declare automake foreign # PATCH-FIX-UPSTREAM: declare automake foreign
Patch0: declare-automake-foreign.patch Patch0: declare-automake-foreign.patch
%if 0%{?suse_version} > 1325 Patch1: boost_168.patch
BuildRequires: libboost_date_time-devel
BuildRequires: libboost_program_options-devel
%else
BuildRequires: boost-devel >= 1.36
%endif
BuildRequires: docbook2X BuildRequires: docbook2X
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: intltool BuildRequires: intltool
@ -45,7 +40,12 @@ BuildRequires: pkgconfig
BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(libcurl)
BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(libxml-2.0)
Requires: %{_name}-%{sover} = %{version} Requires: %{_name}-%{sover} = %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} > 1325
BuildRequires: libboost_date_time-devel
BuildRequires: libboost_program_options-devel
%else
BuildRequires: boost-devel >= 1.36
%endif
%description %description
Sample client to access CMIS-enabled repositories using libcmis. Sample client to access CMIS-enabled repositories using libcmis.
@ -90,6 +90,7 @@ the CMIS interface.
%prep %prep
%setup -q -n %{_name}-%{version} %setup -q -n %{_name}-%{version}
%patch0 -p1 %patch0 -p1
%patch1 -p1
%build %build
autoreconf -fvi autoreconf -fvi
@ -103,7 +104,7 @@ export CXXFLAGS="%{optflags} $(getconf LFS_CFLAGS)"
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install
make %{?_smp_mflags} DESTDIR=%{buildroot} install %make_install
find %{buildroot} -type f -name "*.la" -delete -print find %{buildroot} -type f -name "*.la" -delete -print
%check %check
@ -120,28 +121,25 @@ make check %{?_smp_mflags}
%postun -n %{_name}-c-%{sover} -p /sbin/ldconfig %postun -n %{_name}-c-%{sover} -p /sbin/ldconfig
%files %files
%defattr(-, root, root)
%{_bindir}/cmis-client %{_bindir}/cmis-client
%{_mandir}/man1/cmis-client.1.* %{_mandir}/man1/cmis-client.1%{?ext_man}
%files -n %{_name}-%{sover} %files -n %{_name}-%{sover}
%defattr(-, root, root) %doc AUTHORS NEWS
%doc AUTHORS COPYING.LGPL COPYING.MPL COPYING.GPL NEWS %license COPYING.LGPL COPYING.MPL COPYING.GPL
%{_libdir}/%{_name}-%{incname}.so.* %{_libdir}/%{_name}-%{incname}.so.*
%files -n %{_name}-devel %files -n %{_name}-devel
%defattr(-,root,root)
%{_includedir}/%{_name}-%{incname} %{_includedir}/%{_name}-%{incname}
%{_libdir}/pkgconfig/%{_name}-%{incname}.pc %{_libdir}/pkgconfig/%{_name}-%{incname}.pc
%{_libdir}/%{_name}-%{incname}.so %{_libdir}/%{_name}-%{incname}.so
%files -n %{_name}-c-%{sover} %files -n %{_name}-c-%{sover}
%defattr(-, root, root) %doc AUTHORS NEWS
%doc AUTHORS COPYING.LGPL COPYING.MPL COPYING.GPL NEWS %license COPYING.LGPL COPYING.MPL COPYING.GPL
%{_libdir}/%{_name}-c-%{incname}.so.* %{_libdir}/%{_name}-c-%{incname}.so.*
%files -n %{_name}-c-devel %files -n %{_name}-c-devel
%defattr(-,root,root)
%{_includedir}/%{_name}-c-%{incname} %{_includedir}/%{_name}-c-%{incname}
%{_libdir}/pkgconfig/%{_name}-c-%{incname}.pc %{_libdir}/pkgconfig/%{_name}-c-%{incname}.pc
%{_libdir}/%{_name}-c-%{incname}.so %{_libdir}/%{_name}-c-%{incname}.so