diff options
| -rw-r--r-- | hdrhistogram.spec | 32 |
1 files changed, 6 insertions, 26 deletions
diff --git a/hdrhistogram.spec b/hdrhistogram.spec index 3eb210d..add507d 100644 --- a/hdrhistogram.spec +++ b/hdrhistogram.spec @@ -1,6 +1,6 @@ # remirepo spec file for HdrHistogram_c # -# Copyright (c) 2016-2023 Remi Collet +# Copyright (c) 2016-2024 Remi Collet # License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -21,7 +21,7 @@ Name: HdrHistogram_c%{oldsoname}php Summary: A High Dynamic Range (HDR) Histogram Version: 0.11.8 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD-2-Clause AND CC0-1.0 URL: https://github.com/%{gh_owner}/%{gh_project} @@ -29,14 +29,9 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit} Patch0: bumpsoname.patch -%if 0%{?rhel} == 7 -BuildRequires: cmake3 >= 3.12 -BuildRequires: devtoolset-6-toolchain -%else BuildRequires: cmake >= 3.12 BuildRequires: gcc BuildRequires: gcc-c++ -%endif BuildRequires: zlib-devel Requires: %{name}-libs%{?_isa} = %{version}-%{release} @@ -78,20 +73,14 @@ This package contains the %{libname} library. %prep %setup -q -n %{gh_project}-%{gh_commit} -%patch0 -p1 -b .bump +%patch -P0 -p1 -b .bump mkdir docs cp -pr examples docs/examples %build -%if 0%{?rhel} == 7 -source /opt/rh/devtoolset-6/enable - -%cmake3 \ -%else %cmake \ -%endif -DHDR_HISTOGRAM_INSTALL_STATIC=OFF \ -S . @@ -103,10 +92,6 @@ make %{_smp_mflags} %install -%if 0%{?rhel} == 7 -source /opt/rh/devtoolset-6/enable -%endif - %if 0%{?cmake_install:1} %cmake_install %else @@ -131,13 +116,6 @@ if grep -r static %{buildroot}%{_libdir}/cmake; then fi -%if 0%{?fedora} < 28 && 0%{?rhel} < 8 -%post libs -p /sbin/ldconfig -%postun libs -p /sbin/ldconfig -%endif - - - %files %doc *.md %{_bindir}/hiccup @@ -145,7 +123,6 @@ fi %{_bindir}/hdr_histogram_perf %files libs -%{!?_licensedir:%global license %%doc} %license COPYING.txt %license LICENSE.txt %{_libdir}/%{libname}.so.%{soname}* @@ -160,6 +137,9 @@ fi %changelog +* Thu Aug 22 2024 Remi Collet <remi@remirepo.net> - 0.11.8-2 +- cleanup + * Tue May 2 2023 Remi Collet <remi@remirepo.net> - 0.11.8-1 - update to 0.11.8 |