From 003261c8adf45e3063a5c870e57a4c0615e0f569 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 17 Jun 2020 10:13:02 +0200
Subject: update to 0.11.0 rename to HdrHistogram_c to match Fedora drop patch
 merged upstream

---
 hdrhistogram.spec | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

(limited to 'hdrhistogram.spec')

diff --git a/hdrhistogram.spec b/hdrhistogram.spec
index 881011e..4d5f0c8 100644
--- a/hdrhistogram.spec
+++ b/hdrhistogram.spec
@@ -1,4 +1,4 @@
-# remirepo spec file for hdrhistogram
+# remirepo spec file for HdrHistogram_c
 #
 # Copyright (c) 2016-2020 Remi Collet
 # License: CC-BY-SA
@@ -7,24 +7,22 @@
 # Please, preserve the changelog entries
 #
 
-%global gh_commit   f400fa0de945d458dc83201bf5a369db5220899e
+%global gh_commit   04cb4a110aea00e2c995af3eaa317fe9046b944f
 %global gh_short    %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner    HdrHistogram
 %global gh_project  HdrHistogram_c
 %global libname     libhdr_histogram
 %global soname      6
 
-Name:          hdrhistogram
+Name:          HdrHistogram_c
 Summary:       A High Dynamic Range (HDR) Histogram
-Version:       0.10.0
+Version:       0.11.0
 Release:       1%{?dist}
 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
 
-Patch0:        %{gh_project}-static.patch
-
 %if 0%{?rhel} == 6 || 0%{?rhel} == 7
 BuildRequires: cmake3 >= 3.5
 BuildRequires: devtoolset-6-toolchain
@@ -36,6 +34,7 @@ BuildRequires: gcc-c++
 BuildRequires: zlib-devel
 
 Requires:   %{name}-libs%{?_isa} = %{version}-%{release}
+Obsoletes:  hdrhistogram < 0.11
 
 
 %description
@@ -53,6 +52,7 @@ 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
 
 %description devel
 This package contains the header files and development libraries
@@ -62,6 +62,7 @@ for %{name}.
 %package libs
 Summary:    A High Dynamic Range (HDR) Histogram C library
 Group:      System Environment/Libraries
+Obsoletes:  hdrhistogram-libs < 0.11
 
 %description libs
 This package contains the %{libname} library.
@@ -69,7 +70,6 @@ This package contains the %{libname} library.
 
 %prep
 %setup -q -n %{gh_project}-%{gh_commit}
-%patch0 -p1 -b .pr84
 
 mkdir docs
 cp -pr examples docs/examples
@@ -101,6 +101,11 @@ rm %{buildroot}/%{_bindir}/*test
 %check
 make test
 
+if grep -r static %{buildroot}%{_libdir}/cmake; then
+  : cmake configuration file contain reference to static library
+  exit 1
+fi
+
 
 %if 0%{?fedora} < 28 && 0%{?rhel} < 8
 %post   libs -p /sbin/ldconfig
@@ -130,6 +135,11 @@ make test
 
 
 %changelog
+* Wed Jun 17 2020 Remi Collet <remi@remirepo.net> - 0.11.0-1
+- update to 0.11.0
+- rename to HdrHistogram_c to match Fedora
+- drop patch merged upstream
+
 * Mon Jun 15 2020 Remi Collet <remi@remirepo.net> - 0.10.0-1
 - update to 0.10.0
 - soname bump to 6
-- 
cgit