From 34269cf0be03d0658d01c1892404530fd92c6d71 Mon Sep 17 00:00:00 2001
From: Funda Wang <fundawang@yeah.net>
Date: Mon, 27 Jan 2025 18:38:33 +0800
Subject: [PATCH] adopt to cmake macro migration

(cherry picked from commit de09a0148b90be32bae5142185aff60e60851c27)
---
 blosc.spec => c-blosc.spec | 59 +++++++++++++++++++-------------------
 blosc.yaml => c-blosc.yaml |  0
 2 files changed, 30 insertions(+), 29 deletions(-)
 rename blosc.spec => c-blosc.spec (71%)
 rename blosc.yaml => c-blosc.yaml (100%)

diff --git a/blosc.spec b/c-blosc.spec
similarity index 71%
rename from blosc.spec
rename to c-blosc.spec
index d17e62b..930d334 100644
--- a/blosc.spec
+++ b/c-blosc.spec
@@ -1,6 +1,6 @@
-Name:           blosc
+Name:           c-blosc
 Version:        1.21.6
-Release:        1
+Release:        2
 Summary:        Binary compressor
 License:        BSD-2-Clause AND BSD-3-Clause AND MIT
 URL:            https://github.com/Blosc/c-blosc
@@ -11,41 +11,41 @@ BuildRequires:  cmake lz4-devel snappy-devel zlib-devel libzstd-devel gcc-g++
 %description
 Blosc is a compression library that is faster than traditional compression.
 
-%package        devel
+%package        -n blosc
+Summary:        Binary compressor
+
+%description    -n blosc
+Blosc is a compression library that is faster than traditional compression.
+
+%package        -n blosc-devel
 Summary:        Header files and libraries for Blosc development
-Requires:       %{name} = %{version}-%{release}
+Requires:       blosc = %{version}-%{release}
 
-%description    devel
+%description    -n blosc-devel
 The blosc-devel package contains the header files and libraries needed
 to develop programs that use the blosc meta-compressor.
 
-%package        bench
+%package        -n blosc-bench
 Summary:        Benchmark for the Blosc compressor
-Requires:       %{name} = %{version}-%{release}
+Requires:       blosc = %{version}-%{release}
 Requires:       python3-matplotlib
 
-%description    bench
+%description    -n blosc-bench
 The blosc-bench package contains a benchmark suite which evaluates
 the performance of Blosc, and compares it with memcpy.
 
 %prep
-%autosetup -n c-%{name}-%{version} -p1
-rm -r internal-complibs/lz4* internal-complibs/zstd*
+%autosetup -n %{name}-%{version} -p1
+rm -rf internal-complibs
 
 #rm -r internal-complibs/snappy* internal-complibs/zlib*
 sed -i '1i  set\(CMAKE_SKIP_RPATH true\)' bench/CMakeLists.txt
 sed -i '1i  set\(CMAKE_POSITION_INDEPENDENT_CODE TRUE\)' CMakeLists.txt
-sed -i 's|lib/pkgconfig|%{_lib}/pkgconfig|' CMakeLists.txt
 sed -i '1i  #!/usr/bin/python3' bench/plot-speeds.py
 
 %build
 %cmake \
-%ifarch x86_64
-    %{?_cmake_lib_suffix64} \
-%endif
     -DCMAKE_BUILD_TYPE:STRING="Debug" \
-    -DCMAKE_C_FLAGS:STRING="%{optflags}" \
-    -DCMAKE_INSTALL_PREFIX=%{_prefix} \
     -DBUILD_STATIC:BOOL=OFF \
     -DPREFER_EXTERNAL_LZ4:BOOL=ON \
     -DTEST_INCLUDE_BENCH_SUITE:BOOL=OFF \
@@ -55,36 +55,37 @@ sed -i '1i  #!/usr/bin/python3' bench/plot-speeds.py
 %cmake_build
 
 %check
-LD_LIBRARY_PATH=%{buildroot}%{_libdir} make test VERBOSE=1
+export LD_LIBRARY_PATH=%{buildroot}%{_libdir}
+%ctest
 
 %install
 %cmake_install
 
-install -p bench/plot-speeds.py* -Dt %{buildroot}/%{_pkgdocdir}/bench/
-install -pm 0644 bench/*.c %{buildroot}/%{_pkgdocdir}/bench
-
-install -p bench/bench -D %{buildroot}/%{_bindir}/%{name}-bench
-install -p bench/plot-speeds.py %{buildroot}/%{_bindir}/%{name}-plot-times
+install -p %{__cmake_builddir}/bench/bench -D %{buildroot}/%{_bindir}/blosc-bench
+install -p bench/plot-speeds.py %{buildroot}/%{_bindir}/blosc-plot-times
 
-%files
-%exclude %{_pkgdocdir}/bench/
+%files -n blosc
 %license LICENSES/*
 %{_libdir}/libblosc.so.1*
 %doc README.md ANNOUNCE.rst RELEASE_NOTES.rst README_CHUNK_FORMAT.rst 
 %doc README_THREADED.rst COMPILING_WITH_WHEELS.rst CONTRIBUTING.md code_of_conduct.md
 
-%files devel
+%files -n blosc-devel
 %{_libdir}/libblosc.so
 %{_libdir}/pkgconfig/blosc.pc
 %{_includedir}/blosc.h
 %{_includedir}/blosc-export.h
 
-%files bench
-%{_pkgdocdir}/bench/*.c
-%{_bindir}/%{name}-bench
-%{_bindir}/%{name}-plot-times
+%files -n blosc-bench
+%doc bench/*.c
+%{_bindir}/blosc-bench
+%{_bindir}/blosc-plot-times
 
 %changelog
+* Mon Jan 27 2025 Funda Wang <fundawang@yeah.net> - 1.21.6-2
+- adopt to cmake macro migration
+- rename package so that it could be catched
+
 * Thu Jan 02 2025 yaoxin <1024769339@qq.com> - 1.21.6-1
 - Update to 1.21.6
   * Zlib updated to 1.3.1
diff --git a/blosc.yaml b/c-blosc.yaml
similarity index 100%
rename from blosc.yaml
rename to c-blosc.yaml
-- 
Gitee