summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--librdkafka-soname.patch22
-rw-r--r--librdkafka.spec21
2 files changed, 37 insertions, 6 deletions
diff --git a/librdkafka-soname.patch b/librdkafka-soname.patch
new file mode 100644
index 0000000..f8fbad8
--- /dev/null
+++ b/librdkafka-soname.patch
@@ -0,0 +1,22 @@
+diff -up ./src-cpp/Makefile.old ./src-cpp/Makefile
+--- ./src-cpp/Makefile.old 2020-06-10 11:57:06.098169591 +0200
++++ ./src-cpp/Makefile 2020-06-10 11:57:14.566135935 +0200
+@@ -1,6 +1,6 @@
+ PKGNAME= librdkafka
+ LIBNAME= librdkafka++
+-LIBVER= 1
++LIBVER= 101
+
+ CXXSRCS= RdKafka.cpp ConfImpl.cpp HandleImpl.cpp \
+ ConsumerImpl.cpp ProducerImpl.cpp KafkaConsumerImpl.cpp \
+diff -up ./src/Makefile.old ./src/Makefile
+--- ./src/Makefile.old 2020-06-10 11:57:01.669187194 +0200
++++ ./src/Makefile 2020-06-10 11:57:11.846146744 +0200
+@@ -1,6 +1,6 @@
+ PKGNAME= librdkafka
+ LIBNAME= librdkafka
+-LIBVER= 1
++LIBVER= 101
+
+ -include ../Makefile.config
+
diff --git a/librdkafka.spec b/librdkafka.spec
index 1b0b413..ea7b109 100644
--- a/librdkafka.spec
+++ b/librdkafka.spec
@@ -11,11 +11,13 @@
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner edenhill
%global gh_project %{libname}
+%global oldsoname 1
+%global newsoname 101
%global upstream_version 1.4.2
#global upstream_prever RC1
-Name: %{libname}
+Name: %{libname}%{oldsoname}php
Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
Release: 1%{?dist}
Group: System Environment/Libraries
@@ -26,6 +28,9 @@ 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}-%{upstream_version}%{?upstream_prever}-%{gh_short}.tar.gz
+# Bump soname from 1 to 101 to allow parallel installation
+Patch0: %{libname}-soname.patch
+
BuildRequires: libstdc++-devel
BuildRequires: openssl-devel
%if 0%{?rhel} == 6
@@ -52,6 +57,9 @@ It was designed with message delivery reliability and high performance
in mind, current figures exceed 800000 msgs/second for the producer
and 3 million msgs/second for the consumer.
+%{name} is designed to be installed beside %{libname}
+and only used by PHP binaries (rdkafka extension).
+
%package devel
Group: Development/Libraries
@@ -65,7 +73,7 @@ developing applications that use %{name}.
%prep
%setup -qn %{gh_project}-%{gh_commit}
-# no backup to avoid old version inclusion
+%patch0 -p1 -b .bump
mkdir rpmdocs
cp -pr examples rpmdocs/examples
@@ -100,8 +108,8 @@ rm -r %{buildroot}%{_datadir}/doc/%{libname}
%files
%{!?_licensedir:%global license %%doc}
%license LICENSE*
-%{_libdir}/%{libname}.so.1
-%{_libdir}/%{libname}++.so.1
+%{_libdir}/%{libname}.so.%{newsoname}
+%{_libdir}/%{libname}++.so.%{newsoname}
%files devel
%doc *md
@@ -113,9 +121,10 @@ rm -r %{buildroot}%{_datadir}/doc/%{libname}
%{_libdir}/pkgconfig/rdkafka++.pc
-### NOTICE: available in RHEL-7 and RHEL-8 so not in remi
-
%changelog
+* Wed Jun 10 2020 Remi Collet <remi@remirepo.net> - 1.4.2-2
+- rename to librdkafka1php
+
* Wed May 6 2020 Remi Collet <remi@remirepo.net> - 1.4.2-1
- update to 1.4.2