czanik pushed to riemann-c-client (epel7). "new upstream which brings TLS support (..more)"

[notifications at fedoraproject.org]

>From 033e597563a81d9bc9ee34375ecd6fc1dd356424 Mon Sep 17 00:00:00 2001
From: Peter Czanik <pczanik at fang.fa.gau.hu>
Date: Wed, 29 Apr 2015 12:33:06 +0200
Subject: new upstream which brings TLS support

- add patch to fix gnutls support on F20
- add workaround to detect json on EL6

diff --git a/.gitignore b/.gitignore
index ad04a32..8108611 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /riemann-c-client-1.2.1.tar.xz
+/riemann-c-client-1.6.1.tar.xz
diff --git a/riemann-c-client-1.6.1+gnutls3.1.diff b/riemann-c-client-1.6.1+gnutls3.1.diff
new file mode 100644
index 0000000..8ea9583
--- /dev/null
+++ b/riemann-c-client-1.6.1+gnutls3.1.diff
@@ -0,0 +1,13 @@
+diff --git a/lib/riemann/client/tls-gnutls.c b/lib/riemann/client/tls-gnutls.c
+index de22534..78c46c4 100644
+--- a/lib/riemann/client/tls-gnutls.c
++++ b/lib/riemann/client/tls-gnutls.c
+@@ -29,7 +29,7 @@
+ #include <gnutls/gnutls.h>
+ #include <gnutls/x509.h>
+ 
+-#if GNUTLS_VERSION_MAJOR == 2
++#if GNUTLS_VERSION_MAJOR == 2 || (GNUTLS_VERSION_MAJOR == 3 && GNUTLS_VERSION_MINOR < 3)
+ #include "riemann/client/tls-gnutls2.c"
+ #else
+ #include "riemann/client/tls-gnutls3.c"
diff --git a/riemann-c-client.spec b/riemann-c-client.spec
index a6f6832..0364531 100644
--- a/riemann-c-client.spec
+++ b/riemann-c-client.spec
@@ -5,8 +5,8 @@
 #
 
 Name:		riemann-c-client
-Version:	1.2.1
-Release:	3%{?dist}
+Version:	1.6.1
+Release:	4%{?dist}
 Summary:	The riemann C client
 License:	GPLv2
 Url:		https://github.com/algernon/riemann-c-client
@@ -15,6 +15,8 @@ BuildRequires:	pkgconfig
 BuildRequires:	protobuf-c-devel
 BuildRequires:	json-c-devel
 BuildRequires:	chrpath
+BuildRequires:  gnutls-devel
+Patch0:		riemann-c-client-1.6.1+gnutls3.1.diff
 
 %description
 This is a C client library for the Riemann monitoring system, providing a
@@ -32,11 +34,14 @@ This package provides files necessary for riemann-c-client development.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
-%configure \
-	--disable-static \
-	--disable-rpath
+%if "%{dist}" == ".el6"
+PKG_CONFIG_PATH=/%{_lib}/pkgconfig %configure --disable-static
+%else
+%configure --disable-static
+%endif
 
 make %{_smp_mflags}
 
@@ -52,10 +57,10 @@ rm %{buildroot}/%{_libdir}/libriemann-client.la
 %postun -p /sbin/ldconfig
 
 %files
-%doc docs/API.md NEWS README.md
-%{_libdir}/libriemann-client.so.0
-%{_libdir}/libriemann-client.so.0.2.1
+%doc README.md NEWS.md
+%{_libdir}/libriemann-client.so.*
 %{_bindir}/riemann-client
+%{_mandir}/man1/*.1*
 
 %files devel
 %{_includedir}/riemann/
@@ -63,6 +68,11 @@ rm %{buildroot}/%{_libdir}/libriemann-client.la
 %{_libdir}/pkgconfig/riemann-client.pc
 
 %changelog
+* Fri Apr 24 2015 Peter Czanik - 1.6.1-4
+- new upstream which brings TLS support
+- add patch to fix gnutls support on F20
+- add workaround to detect json on EL6
+
 * Thu Aug 14 2014 Peter Czanik <czanik at balabit.hu> - 1.2.1-3
 - cleanup based on reviews at (#1129630)
 
diff --git a/sources b/sources
index 861b2eb..5f5306f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-78506a149fabf5a94cec22f7b31f17b0  riemann-c-client-1.2.1.tar.xz
+f3270c65ab8efb28b4e69b8e9a5de38d  riemann-c-client-1.6.1.tar.xz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/riemann-c-client.git/commit/?h=epel7&id=033e597563a81d9bc9ee34375ecd6fc1dd356424