From dc792bdac82b6c07852d2fdc76b6e978d83b4a69 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 9 Dec 2020 08:54:34 +0100 Subject: bump soname to 106 and rename to HdrHistogram_c6php to allow parallel installation with default HdrHistogram_c --- hdrhistogram.spec | 48 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 40 insertions(+), 8 deletions(-) (limited to 'hdrhistogram.spec') diff --git a/hdrhistogram.spec b/hdrhistogram.spec index e16b572..a853117 100644 --- a/hdrhistogram.spec +++ b/hdrhistogram.spec @@ -12,9 +12,17 @@ %global gh_owner HdrHistogram %global gh_project HdrHistogram_c %global libname libhdr_histogram -%global soname 6 +%global oldsoname 6 +%global soname 106 -Name: HdrHistogram_c +%if 0%{?fedora} < 33 && 0%{?rhel} < 9 +# to obsolete versions from remi newer than official repo +%bcond_without cleanold +%else +%bcond_with cleanold +%endif + +Name: HdrHistogram_c%{oldsoname}php Summary: A High Dynamic Range (HDR) Histogram Version: 0.11.1 Release: 1%{?dist} @@ -23,7 +31,9 @@ License: CC0 or BSD 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 -%if 0%{?rhel} == 6 || 0%{?rhel} == 7 +Patch0: bumpsoname.patch + +%if 0%{?rhel} == 7 BuildRequires: cmake3 >= 3.5 BuildRequires: devtoolset-6-toolchain %else @@ -34,7 +44,13 @@ BuildRequires: gcc-c++ BuildRequires: zlib-devel Requires: %{name}-libs%{?_isa} = %{version}-%{release} -Obsoletes: hdrhistogram < 0.11 +%if %{with cleanold} +Obsoletes: HdrHistogram_c = 0.10.0 +Obsoletes: HdrHistogram_c = 0.11.0 +Obsoletes: HdrHistogram_c = 0.11.1 +%endif +Obsoletes: hdrhistogram < 0.11 +Conflicts: HdrHistogram_c < %{version} %description @@ -52,7 +68,13 @@ by the Java implementation. The current supported features are: %package devel Summary: Header files and development libraries for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} -Obsoletes: hdrhistogram-devel < 0.11 +%if %{with cleanold} +Obsoletes: HdrHistogram_c-devel = 0.10.0 +Obsoletes: HdrHistogram_c-devel = 0.11.0 +Obsoletes: HdrHistogram_c-devel = 0.11.1 +%endif +Obsoletes: hdrhistogram-devel < 0.11 +Conflicts: HdrHistogram_c-devel < %{version} %description devel This package contains the header files and development libraries @@ -62,7 +84,12 @@ for %{name}. %package libs Summary: A High Dynamic Range (HDR) Histogram C library Group: System Environment/Libraries -Obsoletes: hdrhistogram-libs < 0.11 +%if %{with cleanold} +Obsoletes: HdrHistogram_c-libs = 0.10.0 +Obsoletes: HdrHistogram_c-libs = 0.11.0 +Obsoletes: HdrHistogram_c-libs = 0.11.1 +%endif +Obsoletes: hdrhistogram-libs < 0.11 %description libs This package contains the %{libname} library. @@ -70,13 +97,14 @@ This package contains the %{libname} library. %prep %setup -q -n %{gh_project}-%{gh_commit} +%patch0 -p1 -b .bump mkdir docs cp -pr examples docs/examples %build -%if 0%{?rhel} == 6 || 0%{?rhel} == 7 +%if 0%{?rhel} == 7 source /opt/rh/devtoolset-6/enable %cmake3 \ @@ -94,7 +122,7 @@ make %{_smp_mflags} %install -%if 0%{?rhel} == 6 || 0%{?rhel} == 7 +%if 0%{?rhel} == 7 source /opt/rh/devtoolset-6/enable %endif @@ -148,6 +176,10 @@ fi %changelog +* Tue Dec 8 2020 Remi Collet - 0.11.1-2 +- bump soname to 106 and rename to HdrHistogram_c6php to allow + parallel installation with default HdrHistogram_c + * Fri Sep 11 2020 Remi Collet - 0.11.1-1 - update to 0.11.1 -- cgit