summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--hdrhistogram.spec11
-rw-r--r--pkgconfig.patch58
2 files changed, 6 insertions, 63 deletions
diff --git a/hdrhistogram.spec b/hdrhistogram.spec
index 4f38c13..3bd2ab0 100644
--- a/hdrhistogram.spec
+++ b/hdrhistogram.spec
@@ -7,7 +7,7 @@
# Please, preserve the changelog entries
#
-%global gh_commit 622e3ac6df14fabe81a5857a4a5c9b68c3d3bf18
+%global gh_commit b083efd27a51150201821ef6f18e0eba1f4b59f1
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner HdrHistogram
%global gh_project HdrHistogram_c
@@ -24,15 +24,14 @@
Name: HdrHistogram_c%{oldsoname}php
Summary: A High Dynamic Range (HDR) Histogram
-Version: 0.11.4
-Release: 2%{?dist}
+Version: 0.11.5
+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: bumpsoname.patch
-Patch1: pkgconfig.patch
%if 0%{?rhel} == 7
BuildRequires: cmake3 >= 3.12
@@ -99,7 +98,6 @@ This package contains the %{libname} library.
%prep
%setup -q -n %{gh_project}-%{gh_commit}
%patch0 -p1 -b .bump
-%patch1 -p1 -b .pkgconfig
mkdir docs
cp -pr examples docs/examples
@@ -179,6 +177,9 @@ fi
%changelog
+* Mon Mar 21 2022 Remi Collet <remi@remirepo.net> - 0.11.5-1
+- update to 0.11.5
+
* Tue Mar 1 2022 Remi Collet <remi@remirepo.net> - 0.11.4-2
- better fix for pkgconfig file
diff --git a/pkgconfig.patch b/pkgconfig.patch
deleted file mode 100644
index f4500bd..0000000
--- a/pkgconfig.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 7248409b5b56c825fe3c0a50c4c7e304e8551b40 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Tue, 1 Mar 2022 09:47:38 +0100
-Subject: [PATCH] fix pkgconfig installation
-
----
- CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f6313ab..51bcc6e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -107,6 +107,6 @@ configure_file(
- @ONLY
- )
- install(
-- FILES ${CMAKR_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc
-- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pkgconfig
-+ FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
- )
-From 2df75f0b666761a650f7afb749f2dc72e8afb5a2 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Tue, 1 Mar 2022 14:59:44 +0100
-Subject: [PATCH 3/3] Clean pkgconfig
-
----
- CMakeLists.txt | 4 +---
- hdr_histogram.pc.in | 2 +-
- 2 files changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 51bcc6e..4a09589 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -95,10 +95,8 @@ set(CPACK_GENERATOR "TGZ")
- include(CPack)
-
- if(${ZLIB_FOUND})
-- set(PC_LIBS_PRIVATE_ZLIB "-lz")
-- set(PC_REQUIRES_PRIVATE_ZLIB "zlib >= 1.2.11")
-+ set(PC_REQUIRES_PRIVATE_ZLIB "zlib")
- else()
-- set(PC_LIBS_PRIVATE_ZLIB "")
- set(PC_REQUIRES_PRIVATE_ZLIB "")
- endif()
- configure_file(
-diff --git a/hdr_histogram.pc.in b/hdr_histogram.pc.in
-index a88e5e9..8494dc3 100644
---- a/hdr_histogram.pc.in
-+++ b/hdr_histogram.pc.in
-@@ -9,4 +9,4 @@ Version: @PROJECT_VERSION@
- Requires.private: @PC_REQUIRES_PRIVATE_ZLIB@
- Cflags: -I${includedir}
- Libs: -L${libdir} -l@PROJECT_NAME@
--Libs.private: -pthread -lm -lrt @PC_LIBS_PRIVATE_ZLIB@ -L${libdir}
-+Libs.private: -pthread -lm -lrt -L${libdir}