From fa16e13113717913e617c360e0681e50604d0df4 Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa@datto.com>
Date: Feb 03 2021 23:53:18 +0000
Subject: Update to upstream 1.6.0


- Enable all missing features
- Fix linking to external lz4 library
- Minor spec cleanups

---

diff --git a/.gitignore b/.gitignore
index 061907b..b397aca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
 /librdkafka-0.11.6.tar.gz
 /librdkafka-1.3.0.tar.gz
 /librdkafka-1.5.0.tar.gz
+/librdkafka-1.6.0.tar.gz
diff --git a/librdkafka.spec b/librdkafka.spec
index 936e321..1157213 100644
--- a/librdkafka.spec
+++ b/librdkafka.spec
@@ -1,19 +1,22 @@
 Name:		librdkafka
-Version:	1.5.0
-Release:	2%{?dist}
+Version:	1.6.0
+Release:	1%{?dist}
 Summary:	The Apache Kafka C library
 
 License:	BSD
 URL:		https://github.com/edenhill/librdkafka
-Source0:	https://github.com/edenhill/librdkafka/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Source0:	%{url}/archive/v%{version}/%{name}-%{version}.tar.gz
 
 BuildRequires:	gcc
 BuildRequires:	gcc-c++
+BuildRequires:	make
 BuildRequires:	python3
-BuildRequires:  openssl-devel
-BuildRequires:  cyrus-sasl-devel
-BuildRequires:  lz4-devel
-BuildRequires: make
+BuildRequires:	libzstd-devel
+BuildRequires:	lz4-devel
+BuildRequires:	openssl-devel
+BuildRequires:	cyrus-sasl-devel
+BuildRequires:	zlib-devel
+BuildRequires:	rapidjson-devel
 
 %description
 Librdkafka is a C/C++ library implementation of the Apache Kafka protocol,
@@ -33,7 +36,7 @@ This package contains headers and libraries required to build applications
 using librdkafka.
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
 # This package has a configure test which uses ASMs, but does not link the
@@ -45,9 +48,14 @@ using librdkafka.
 # F34, so we use it here explicitly
 %define _lto_cflags -flto=auto -ffat-lto-objects
 
-%configure --enable-lz4 \
-           --enable-ssl \
-           --enable-sasl
+%configure \
+    --enable-zlib \
+    --enable-zstd \
+    --enable-lz4 \
+    --enable-lz4-ext \
+    --enable-ssl \
+    --enable-gssapi \
+    --enable-sasl
 
 %make_build
 
@@ -57,13 +65,14 @@ make check
 %install
 %make_install
 find %{buildroot} -name '*.a' -delete -print
+find %{buildroot} -name '*-static.pc' -delete -print
 
 %ldconfig_scriptlets
 
 %files
 %{_libdir}/librdkafka.so.*
 %{_libdir}/librdkafka++.so.*
-%doc README.md CONFIGURATION.md INTRODUCTION.md LICENSE LICENSES.txt STATISTICS.md
+%doc README.md CONFIGURATION.md INTRODUCTION.md LICENSE LICENSES.txt STATISTICS.md CHANGELOG.md
 %license LICENSE LICENSE.pycrc LICENSE.snappy
 
 %files devel
@@ -73,11 +82,16 @@ find %{buildroot} -name '*.a' -delete -print
 %attr(0755,root,root) %{_libdir}/librdkafka++.so
 %{_libdir}/pkgconfig/rdkafka.pc
 %{_libdir}/pkgconfig/rdkafka++.pc
-%{_libdir}/pkgconfig/rdkafka-static.pc
-%{_libdir}/pkgconfig/rdkafka++-static.pc
 
 
 %changelog
+* Wed Feb 03 2021 Neal Gompa <ngompa@datto.com> - 1.6.0-1
+- Update to upstream 1.6.0
+  resolves: rhbz#1883910
+- Enable all missing features
+- Fix linking to external lz4 library
+- Minor spec cleanups
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
diff --git a/sources b/sources
index b6726d3..7791c8f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (librdkafka-1.5.0.tar.gz) = ccd8dd3e90c9315833610745c28e0ffa60786324c938c7cbbb2ff847d7493d1b72d97adf5e5210bbc87970047cfd7e58a85141534d227187f2f17c492bef4262
+SHA512 (librdkafka-1.6.0.tar.gz) = b58d701f71342eb2c29ecd5aa0514af351b5a5d2282768e034b5995300fcbe2c416d6b4e15dfaddaacf2ec3b7571a320bf5356ade3fe33598d3f05f99f6553ba