From 6102f62b25a9642552d572a8e2e8c2baf3b0cc71 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 1 Mar 2022 15:13:55 +0100 Subject: better fix for pkgconfig file --- hdrhistogram.spec | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'hdrhistogram.spec') diff --git a/hdrhistogram.spec b/hdrhistogram.spec index f6a7461..4f38c13 100644 --- a/hdrhistogram.spec +++ b/hdrhistogram.spec @@ -25,13 +25,14 @@ Name: HdrHistogram_c%{oldsoname}php Summary: A High Dynamic Range (HDR) Histogram Version: 0.11.4 -Release: 1%{?dist} +Release: 2%{?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: bumpsoname.patch +Patch1: pkgconfig.patch %if 0%{?rhel} == 7 BuildRequires: cmake3 >= 3.12 @@ -98,12 +99,7 @@ This package contains the %{libname} library. %prep %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 -%if 0%{?rhel} == 7 -sed -e '/^Requires.private/d' -i hdr_histogram.pc.in -%endif +%patch1 -p1 -b .pkgconfig mkdir docs cp -pr examples docs/examples @@ -183,13 +179,19 @@ fi %changelog -* Thu Dec 10 2020 Remi Collet - 0.11.2-1 -- update to 0.11.1 +* Tue Mar 1 2022 Remi Collet - 0.11.4-2 +- better fix for pkgconfig file + +* Tue Mar 1 2022 Remi Collet - 0.11.4-1 +- update to 0.11.4 - add pkgconfig file, fix its installation using patch from https://github.com/HdrHistogram/HdrHistogram_c/pull/104 - fix pkgconfig file using patch from https://github.com/HdrHistogram/HdrHistogram_c/pull/105 +* Thu Dec 10 2020 Remi Collet - 0.11.2-1 +- update to 0.11.2 + * 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 -- cgit