[fts] Added missing json-c dependency

Alejandro Alvarez aalvarez at fedoraproject.org
Thu Mar 5 10:09:43 UTC 2015


commit df8611cf69dc94295323514503789ae21af76aa0
Author: Alejandro Alvarez Ayllon <aalvarez at cern.ch>
Date:   Thu Mar 5 11:09:29 2015 +0100

    Added missing json-c dependency

 fts-jsonc.patch | 13 +++++++++++++
 fts.spec        |  3 +++
 2 files changed, 16 insertions(+)
---
diff --git a/fts-jsonc.patch b/fts-jsonc.patch
new file mode 100644
index 0000000..3d72d4d
--- /dev/null
+++ b/fts-jsonc.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/modules/FindJSONC.cmake b/cmake/modules/FindJSONC.cmake
+index 8ec2337..fb1498b 100644
+--- a/cmake/modules/FindJSONC.cmake
++++ b/cmake/modules/FindJSONC.cmake
+@@ -8,7 +8,7 @@ find_library(JSONC_LIBRARIES
+ 
+ find_path(JSONC_INCLUDE_DIRS
+      NAMES json.h
+-    HINTS /usr/include/json
++    HINTS /usr/include/json /usr/include/json-c
+     DOC "json-c headers"
+ )
+
diff --git a/fts.spec b/fts.spec
index 3946087..6f63e74 100644
--- a/fts.spec
+++ b/fts.spec
@@ -18,6 +18,7 @@ Source0:	%{name}-%{version}.tar.gz
 Source1:	fts.te
 Source2:	fts.fc
 Patch0:		fts-3.2.30-boost157.patch
+Patch1:		fts-jsonc.patch
 
 %if 0%{?el5}
 BuildRequires:	activemq-cpp-library
@@ -45,6 +46,7 @@ BuildRequires:	globus-gsi-credential-devel
 BuildRequires:	gridsite-devel
 BuildRequires:	gsoap-devel
 BuildRequires:	is-interface-devel
+BuildRequires:	json-c-devel
 BuildRequires:	libcurl-devel
 BuildRequires:	openldap-devel
 BuildRequires:	pugixml-devel
@@ -163,6 +165,7 @@ This package setup the SELinux policies for the FTS3 server.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 mkdir SELinux
 cp -p %{SOURCE1} %{SOURCE2} SELinux
 


More information about the scm-commits mailing list