diff options
| -rw-r--r-- | librdkafka-upstream.patch | 29 | ||||
| -rw-r--r-- | librdkafka.spec | 23 |
2 files changed, 8 insertions, 44 deletions
diff --git a/librdkafka-upstream.patch b/librdkafka-upstream.patch deleted file mode 100644 index 062a9c3..0000000 --- a/librdkafka-upstream.patch +++ /dev/null @@ -1,29 +0,0 @@ -From ac916159a08ccb135a73891dc4e25b7be18223d2 Mon Sep 17 00:00:00 2001 -From: Magnus Edenhill <magnus@edenhill.se> -Date: Mon, 11 Jan 2016 10:22:29 +0100 -Subject: [PATCH] Snappy endian swapping for older glibc 2.9 (issue #505, #407) - ---- - src/snappy_compat.h | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/snappy_compat.h b/src/snappy_compat.h -index 5167a72..2c2375b 100644 ---- a/src/snappy_compat.h -+++ b/src/snappy_compat.h -@@ -136,10 +136,14 @@ typedef unsigned long long u64; - #define __LITTLE_ENDIAN__ 1 - #endif - --#if __LITTLE_ENDIAN__ == 1 && (defined(__LSB_VERSION__) || defined(__WIN32__)) -+#if __LITTLE_ENDIAN__ == 1 || defined(__WIN32__) -+#ifndef htole16 - #define htole16(x) (x) -+#endif -+#ifndef le32toh - #define le32toh(x) (x) - #endif -+#endif - - - #if defined(_MSC_VER) diff --git a/librdkafka.spec b/librdkafka.spec index 778821f..ed085bb 100644 --- a/librdkafka.spec +++ b/librdkafka.spec @@ -7,13 +7,13 @@ # Please, preserve the changelog entries # %global libname librdkafka -%global gh_commit 0c15023708302c41a36e95f9650d69c453dfabba +%global gh_commit 2213fb29f98a7a73f22da21ef85e0783f6fd67c4 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner edenhill %global gh_project %{libname} Name: %{libname} -Version: 0.9.0 +Version: 0.9.1 Release: 1%{?dist} Group: System Environment/Libraries Summary: Apache Kafka C/C++ client library @@ -23,8 +23,6 @@ License: BSD and MIT URL: https://github.com/%{gh_owner}/%{gh_project} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz -Patch1: %{name}-upstream.patch - # i686 required ExcludeArch: i386 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -33,6 +31,7 @@ BuildRequires: cyrus-sasl-devel BuildRequires: zlib-devel BuildRequires: libstdc++-devel BuildRequires: gcc-c++ +BuildRequires: python %description @@ -57,8 +56,6 @@ developing applications that use %{name}. %prep %setup -qn %{gh_project}-%{gh_commit} -%patch1 -p1 -b .upstream - mkdir rpmdocs cp -pr examples rpmdocs/examples @@ -77,14 +74,6 @@ make install DESTDIR=%{buildroot} rm %{buildroot}%{_libdir}/*.a -# https://github.com/edenhill/librdkafka/issues/275 -if test -f %{buildroot}%{_libdir}/pkgconfig/rdkafka.pc -then - : pkgconfig installed, can clean this test -else - install -Dpm 0644 rdkafka.pc %{buildroot}%{_libdir}/pkgconfig/rdkafka.pc -fi - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -105,12 +94,16 @@ fi %{_libdir}/%{libname}.so %{_libdir}/%{libname}++.so %{_libdir}/pkgconfig/rdkafka.pc +%{_libdir}/pkgconfig/rdkafka++.pc %changelog +* Sun May 29 2016 Remi Collet <remi@fedoraproject.org> - 0.9.1-1 +- update to 0.9.1 + * Sat Jan 9 2016 Remi Collet <remi@fedoraproject.org> - 0.9.0-1 - update to 0.9.0 - add upstream patch for old glibc (RHEL-5) * Thu May 14 2015 Remi Collet <remi@fedoraproject.org> - 0.8.6-1 -- initial package
\ No newline at end of file +- initial package |