- build with json-c 0.11

diff --git a/grive.spec b/grive.spec
index d3319402033935efbc4d63739f3a2671de05bb87..5c3e9ed624ace7e86a5d8b0604a94e8186effbf3 100644 (file)
--- a/grive.spec
+++ b/grive.spec
@@ -11,6 +11,7 @@ Group:                Applications/Networking
 Source0:       https://github.com/Grive/grive/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
 # Source0-md5: 4f3c3411588f889801bd5b9297e6e2c9
 # https://github.com/Grive/grive/issues/187
+Patch0:                json-c.patch
 Patch1:                %{name}-bgrive_cmake_fix.patch
 URL:           http://www.lbreda.com/grive/
 BuildRequires: QtCore-devel
@@ -19,7 +20,7 @@ BuildRequires:        boost-devel
 BuildRequires: cmake
 BuildRequires: curl-devel
 BuildRequires: expat-devel
-BuildRequires: json-c-devel
+BuildRequires: json-c-devel >= 0.11
 BuildRequires: libgcrypt-devel
 BuildRequires: libstdc++-devel
 BuildRequires: openssl-devel
@@ -41,6 +42,7 @@ GUI frontend for %{name}
 
 %prep
 %setup -q -n %{name}-%{commit}
+%patch0 -p1
 %patch1 -p1
 
 %build

diff --git a/json-c.patch b/json-c.patch
new file mode 100644 (file)
index 0000000..ea43775
--- /dev/null
+++ b/json-c.patch
@@ -0,0 +1,13 @@
+--- grive-27817e835fe115ebbda5410ec904aa49a2ad01f1/cmake/Modules/FindJSONC.cmake~      2013-05-02 18:40:04.000000000 +0200
++++ grive-27817e835fe115ebbda5410ec904aa49a2ad01f1/cmake/Modules/FindJSONC.cmake       2013-12-04 01:11:58.326961184 +0100
+@@ -6,8 +6,8 @@
+ #  JSONC_INCLUDE_DIR - The JSON-C include directory.
+ #  JSONC_LIBRARY     - The JSON-C library to link against.
+ 
+-FIND_PATH(JSONC_INCLUDE_DIR json/json.h)
+-FIND_LIBRARY(JSONC_LIBRARY NAMES json)
++FIND_PATH(JSONC_INCLUDE_DIR json-c/json.h)
++FIND_LIBRARY(JSONC_LIBRARY NAMES json-c)
+ 
+ IF (JSONC_INCLUDE_DIR AND JSONC_LIBRARY)
+    SET(JSONC_FOUND TRUE)