From c13dc0f5006ad1f4299255a83a858098e6bfc2d1 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 1 Mar 2022 10:57:01 +0100 Subject: update to 0.11.1 add pkgconfig file, fix its installation using patch from https://github.com/HdrHistogram/HdrHistogram_c/pull/104 --- hdrhistogram.spec | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'hdrhistogram.spec') diff --git a/hdrhistogram.spec b/hdrhistogram.spec index 33acf12..1a972e5 100644 --- a/hdrhistogram.spec +++ b/hdrhistogram.spec @@ -1,13 +1,13 @@ # remirepo spec file for HdrHistogram_c # -# Copyright (c) 2016-2020 Remi Collet +# Copyright (c) 2016-2022 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # -%global gh_commit 16a9c93ef9f9e766d9336863da80bdf2e0543bee +%global gh_commit 622e3ac6df14fabe81a5857a4a5c9b68c3d3bf18 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner HdrHistogram %global gh_project HdrHistogram_c @@ -24,7 +24,7 @@ Name: HdrHistogram_c%{oldsoname}php Summary: A High Dynamic Range (HDR) Histogram -Version: 0.11.2 +Version: 0.11.4 Release: 1%{?dist} License: CC0 or BSD @@ -34,10 +34,10 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit} Patch0: bumpsoname.patch %if 0%{?rhel} == 7 -BuildRequires: cmake3 >= 3.5 +BuildRequires: cmake3 >= 3.12 BuildRequires: devtoolset-6-toolchain %else -BuildRequires: cmake >= 3.5 +BuildRequires: cmake >= 3.12 BuildRequires: gcc BuildRequires: gcc-c++ %endif @@ -99,6 +99,9 @@ This package contains the %{libname} library. %setup -q -n %{gh_project}-%{gh_commit} %patch0 -p1 -b .bump +sed -e 's/CMAKE_INSTALL_DATAROOTDIR/CMAKE_INSTALL_LIBDIR/' -i CMakeLists.txt +sed -e 's/CMAKR_CURRENT_BINARY_DIR/CMAKE_CURRENT_BINARY_DIR/' -i CMakeLists.txt + mkdir docs cp -pr examples docs/examples @@ -172,12 +175,15 @@ fi %doc docs/examples %{_libdir}/%{libname}.so %{_libdir}/cmake/hdr_histogram +%{_libdir}/pkgconfig/hdr_histogram.pc %{_includedir}/hdr %changelog * Thu Dec 10 2020 Remi Collet - 0.11.2-1 - update to 0.11.1 +- add pkgconfig file, fix its installation using patch from + https://github.com/HdrHistogram/HdrHistogram_c/pull/104 * Tue Dec 8 2020 Remi Collet - 0.11.1-2 - bump soname to 106 and rename to HdrHistogram_c6php to allow -- cgit