[libmtp] test to patch in a config.h header

Linus Walleij snirkel at fedoraproject.org
Tue Aug 26 20:02:35 UTC 2014


commit df11318f06d77c0a0f24fb64c84628bcd1d7cb9b
Author: Linus Walleij <triad at df.lth.se>
Date:   Tue Aug 26 22:02:27 2014 +0200

    test to patch in a config.h header

 config.patch |   11 +++++++++++
 libmtp.spec  |    7 ++++++-
 2 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/config.patch b/config.patch
new file mode 100644
index 0000000..fa72589
--- /dev/null
+++ b/config.patch
@@ -0,0 +1,11 @@
+diff -ur libmtp-1.1.7-orig/src/util.h libmtp-1.1.7/src/util.h
+--- libmtp-1.1.7-orig/src/util.h	2014-08-26 21:58:04.087428635 +0200
++++ libmtp-1.1.7/src/util.h	2014-08-26 21:58:42.597180810 +0200
+@@ -22,6 +22,7 @@
+ 
+ #ifndef __MTP__UTIL__H
+ #define __MTP__UTIL__H
++#include "config.h"
+ 
+ void data_dump(FILE *f, void *buf, uint32_t nbytes);
+ void data_dump_ascii (FILE *f, void *buf, uint32_t n, uint32_t dump_boundry);
diff --git a/libmtp.spec b/libmtp.spec
index 1885266..abcbc6a 100644
--- a/libmtp.spec
+++ b/libmtp.spec
@@ -5,12 +5,13 @@
 
 Name:           libmtp
 Version:        1.1.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A software library for MTP media players
 URL:            http://libmtp.sourceforge.net/
 
 Group:          System Environment/Libraries
 Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Patch0:         config.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License:        LGPLv2+
 Requires:       udev
@@ -45,6 +46,7 @@ library for MTP media players.
 
 %prep
 %setup -q
+%patch0 -p1 -b .configh
 
 %build
 %configure --disable-static \
@@ -107,6 +109,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tis Aug 26 2014 Linus Walleij <triad at df.lth.se> - 1.1.7-2
+- Fix an include problem. Or try to.
+
 * Sun Aug 24 2014 Linus Walleij <triad at df.lth.se> - 1.1.7-1
 - New upstream version.
 


More information about the scm-commits mailing list