From 9ec75202c5cf410e2ba9865b0edb11d6de143734 Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Thu, 14 Nov 2024 10:42:05 +0800 Subject: [PATCH] adopt to new cmake macro --- snappy.spec | 26 ++++++++------------------ snappy.yaml | 2 +- 2 files changed, 9 insertions(+), 19 deletions(-) diff --git a/snappy.spec b/snappy.spec index b45de6a..9179036 100644 --- a/snappy.spec +++ b/snappy.spec @@ -1,6 +1,6 @@ Name: snappy Version: 1.1.10 -Release: 2 +Release: 3 Summary: A fast compressor/decompressor License: BSD URL: https://github.com/google/snappy @@ -21,7 +21,6 @@ speeds and reasonable compression. Summary: Development files for snappy Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: cmake-filesystem pkgconfig %description devel This package is the development files for snappy. @@ -32,33 +31,21 @@ This package is the development files for snappy. %autosetup -n %{name}-%{version} -p1 %build -%cmake -DSNAPPY_ENABLE_RTTI=ON -DCMAKE_CXX_STANDARD=14 -%make_build +%cmake -DSNAPPY_ENABLE_RTTI=ON -DCMAKE_CXX_STANDARD=14 +%cmake_build %install -rm -rf %{buildroot} -mkdir %{buildroot} -%make_install +%cmake_install install -p -D %{SOURCE1} %{buildroot}%{_libdir}/pkgconfig/snappy.pc %check -make test - -%pre - -%preun - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%ctest %files -%defattr(-,root,root) %license COPYING AUTHORS %{_libdir}/libsnappy.so.* %files devel -%defattr(-,root,root) %doc format_*.txt framing_*.txt %{_includedir}/snappy*.h %{_libdir}/libsnappy.so @@ -69,6 +56,9 @@ make test %doc NEWS README.md %changelog +* Thu Nov 14 2024 Funda Wang - 1.1.10-3 +- adopt to new cmake macro + * Fri Jan 12 2024 zhoupengcheng -1.1.10-2 - Build with C++14 instead of C++11; gtest 1.13.0 requires it diff --git a/snappy.yaml b/snappy.yaml index d57f8d5..18161c5 100644 --- a/snappy.yaml +++ b/snappy.yaml @@ -1,4 +1,4 @@ version_control: github src_repo: google/snappy tag_prefix: ^ -seperator: . \ No newline at end of file +separator: . -- Gitee