From e0b768ed68a40d9014f22b8a1c6fd823365a360f Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 27 Apr 2023 08:37:19 +0200
Subject: update to 0.11.7

---
 hdrhistogram.spec | 41 +++++++++++++++--------------------------
 1 file changed, 15 insertions(+), 26 deletions(-)

(limited to 'hdrhistogram.spec')

diff --git a/hdrhistogram.spec b/hdrhistogram.spec
index 3bd2ab0..b4d4054 100644
--- a/hdrhistogram.spec
+++ b/hdrhistogram.spec
@@ -1,13 +1,15 @@
 # remirepo spec file for HdrHistogram_c
 #
-# Copyright (c) 2016-2022 Remi Collet
-# License: CC-BY-SA
+# Copyright (c) 2016-2023 Remi Collet
+# License: CC-BY-SA-4.0
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
 
-%global gh_commit   b083efd27a51150201821ef6f18e0eba1f4b59f1
+%bcond_without      tests
+
+%global gh_commit   d80e30acf7248acf184b560fef77cb0cebf92845
 %global gh_short    %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner    HdrHistogram
 %global gh_project  HdrHistogram_c
@@ -15,18 +17,12 @@
 %global oldsoname   6
 %global soname      106
 
-%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.5
+Version:       0.11.7
 Release:       1%{?dist}
-License:       CC0 or BSD
+License:       BSD-2-Clause AND CC0-1.0
 
 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
@@ -44,11 +40,6 @@ BuildRequires: gcc-c++
 BuildRequires: zlib-devel
 
 Requires:   %{name}-libs%{?_isa} = %{version}-%{release}
-%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}-%{release}
 
@@ -68,11 +59,6 @@ by the Java implementation. The current supported features are:
 %package devel
 Summary:    Header files and development libraries for %{name}
 Requires:   %{name}%{?_isa} = %{version}-%{release}
-%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}-%{release}
 
@@ -84,11 +70,6 @@ for %{name}.
 %package libs
 Summary:    A High Dynamic Range (HDR) Histogram C library
 Group:      System Environment/Libraries
-%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
@@ -136,11 +117,13 @@ rm %{buildroot}/%{_bindir}/*test
 
 
 %check
+%if %{with tests}
 %if 0%{?ctest:1}
 %ctest
 %else
 make test
 %endif
+%endif
 
 if grep -r static %{buildroot}%{_libdir}/cmake; then
   : cmake configuration file contain reference to static library
@@ -177,6 +160,12 @@ fi
 
 
 %changelog
+* Thu Apr 27 2023 Remi Collet <remi@remirepo.net> - 0.11.7-1
+- update to 0.11.7
+
+* Tue Sep 27 2022 Remi Collet <remi@remirepo.net> - 0.11.6-1
+- update to 0.11.6
+
 * Mon Mar 21 2022 Remi Collet <remi@remirepo.net> - 0.11.5-1
 - update to 0.11.5
 
-- 
cgit