From 27cfce7ecfcc91578cafe41d6255d0973999188c Mon Sep 17 00:00:00 2001 From: Lukas Zapletal Date: Wed, 12 Feb 2020 09:52:14 +0100 Subject: [PATCH] Removed CMAKE patch --- .gitignore | 5 ++++- 0001-respect-flags.patch | 17 ----------------- HdrHistogram_c.spec | 7 ++++--- 3 files changed, 8 insertions(+), 21 deletions(-) delete mode 100644 0001-respect-flags.patch diff --git a/.gitignore b/.gitignore index ea875d9..cd1abe5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ -/HdrHistogram_c-0.9.11.tar.gz +.build* +x86_64/ +HdrHistogram_c-*.rpm +/HdrHistogram_c-*.tar.gz /HdrHistogram_c-0.9.12.tar.gz diff --git a/0001-respect-flags.patch b/0001-respect-flags.patch deleted file mode 100644 index 1325569..0000000 --- a/0001-respect-flags.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 561b5b0..b651093 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -24,9 +24,9 @@ set(HDR_SOVERSION ${HDR_SOVERSION_CURRENT}) - ENABLE_TESTING() - - if(UNIX) -- set(CMAKE_C_FLAGS "-Wall -Wno-unknown-pragmas -Wextra -Wshadow -Winit-self -Wmissing-prototypes -Wpedantic -D_GNU_SOURCE -std=gnu89") -- set(CMAKE_C_FLAGS_DEBUG "-O0 -g") -- set(CMAKE_C_FLAGS_RELEASE "-O3 -g") -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wno-unknown-pragmas -Wextra -Wshadow -Winit-self -Wmissing-prototypes -Wpedantic -D_GNU_SOURCE -std=gnu89") -+ set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -g") -+ set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -g") - endif() - - if(WIN32) diff --git a/HdrHistogram_c.spec b/HdrHistogram_c.spec index 62ae3ea..52aac7e 100644 --- a/HdrHistogram_c.spec +++ b/HdrHistogram_c.spec @@ -5,7 +5,6 @@ Summary: C port of the HdrHistogram License: BSD and Public Domain URL: https://github.com/HdrHistogram/%{name} Source0: https://github.com/HdrHistogram/%{name}/archive/%{version}/%{name}-%{version}.tar.gz -Patch0: 0001-respect-flags.patch BuildRequires: gcc g++ cmake zlib-devel @@ -40,6 +39,7 @@ test/hdr_histogram_test rm -rf $RPM_BUILD_ROOT %make_install find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' +find $RPM_BUILD_ROOT %ldconfig_post @@ -54,8 +54,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %exclude %{_bindir}/perftest %exclude %{_bindir}/hdr_histogram_log_test %exclude %{_bindir}/hdr_histogram_test -%{_libdir}/libhdr_histogram.so.3.1.2 -%{_libdir}/libhdr_histogram.so.3 +%exclude %{_bindir}/hdr_histogram_atomic_test +%{_libdir}/libhdr_histogram.so.4.2.0 +%{_libdir}/libhdr_histogram.so.4 %exclude %{_libdir}/libhdr_histogram_static.a %files devel