+ libmtp-1.1.13-7

Fix multilib conflicts in host specific internal header

0001-doc-Don-t-document-internal-endian-macros.patch

@@ -0,0 +1,26 @@
+From 35275512f83d246ddbddd2be2b970925e73df45e Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Mon, 9 Oct 2017 14:25:26 +0200
+Subject: [PATCH] doc: Don't document internal endian macros
+
+As those will change across platforms, and lead to multilib conflicts
+---
+ doc/Doxyfile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
+index 65c2b83..1bc3b16 100644
+--- a/doc/Doxyfile.in
++++ b/doc/Doxyfile.in
+@@ -452,7 +452,7 @@ EXCLUDE_SYMLINKS       = NO
+ # EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
+ # certain files from those directories.
+ 
+-EXCLUDE_PATTERNS       = 
++EXCLUDE_PATTERNS       = */src/gphoto2-endian.h
+ 
+ # The EXAMPLE_PATH tag can be used to specify one or more files or 
+ # directories that contain example code fragments that are included (see 
+-- 
+2.14.2
+

libmtp.spec

@@ -3,7 +3,7 @@
 
 Name:           libmtp
 Version:        1.1.13
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A software library for MTP media players
 URL:            http://libmtp.sourceforge.net/
 
@@ -15,6 +15,8 @@ BuildRequires:  doxygen
 BuildRequires:  libgcrypt-devel
 BuildRequires:  chrpath
 
+Patch0:         0001-doc-Don-t-document-internal-endian-macros.patch
+
 %description
 This package provides a software library for communicating with MTP
 (Media Transfer Protocol) media players, typically audio players, video
@@ -41,6 +43,7 @@ library for MTP media players.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --disable-static \
@@ -105,6 +108,10 @@ chrpath --delete $RPM_BUILD_ROOT{%{_bindir},/usr/lib/udev}/mtp*
 %{_libdir}/pkgconfig/libmtp.pc
 
 %changelog
+* Mon Oct 09 2017 Bastien Nocera <bnocera@redhat.com> - 1.1.13-7
++ libmtp-1.1.13-7
+- Fix multilib conflicts in host specific internal header
+
 * Wed Sep 06 2017 Bastien Nocera <bnocera@redhat.com> - 1.1.13-6
 + libmtp-1.1.13-5
 - Fix build on EPEL7 where the doc directory is versioned