Merge branch 'rawhide' into epel8

zswap-cli.spec

@@ -1,5 +1,7 @@
+%undefine __cmake_in_source_build
+
 Name: zswap-cli
-Version: 0.4.1
+Version: 0.5.0
 Release: 1%{?dist}
 
 Summary: Command-line tool to control zswap options
@@ -7,15 +9,15 @@ License: MIT
 URL: https://github.com/xvitaly/%{name}
 Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
 
-BuildRequires: kernel-headers
-BuildRequires: glibc-headers
-BuildRequires: cxxopts-devel
-BuildRequires: ninja-build
-BuildRequires: fmt-devel
-BuildRequires: systemd
-BuildRequires: gcc-c++
-BuildRequires: pandoc
+BuildRequires: boost-devel
 BuildRequires: cmake
+BuildRequires: fmt-devel
+BuildRequires: gcc-c++
+BuildRequires: glibc-headers
+BuildRequires: kernel-headers
+BuildRequires: ninja-build
+BuildRequires: pandoc
+BuildRequires: systemd
 
 %{?systemd_requires}
 
@@ -24,15 +26,13 @@ ZSwap-cli is a command-line tool to control zswap options.
 
 %prep
 %autosetup
-mkdir -p %{_target_platform}
 
 %build
-pushd %{_target_platform}
-    %cmake -G Ninja \
+%cmake -G Ninja \
     -DCMAKE_BUILD_TYPE=Release \
-    ..
-popd
-%ninja_build -C %{_target_platform}
+    -DBUILD_DOCS:BOOL=OFF \
+    -DBUILD_MANPAGE:BOOL=ON
+%cmake_build
 
 %post
 %systemd_post %{name}.service
@@ -44,7 +44,7 @@ popd
 %systemd_postun_with_restart %{name}.service
 
 %install
-%ninja_install -C %{_target_platform}
+%cmake_install
 
 %files
 %doc README.md docs/*
@@ -52,9 +52,26 @@ popd
 %{_sbindir}/%{name}
 %{_unitdir}/%{name}.service
 %{_mandir}/man1/%{name}.*
-%config(noreplace) %{_sysconfdir}/%{name}.conf
+%dir %{_sysconfdir}/%{name}
+%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
 
 %changelog
+* Thu Apr 01 2021 Vitaly Zaitsev <vitaly@easycoding.org> - 0.5.0-1
+- Updated to version 0.5.0.
+
+* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.4.1-5
+- Rebuilt for updated systemd-rpm-macros
+  See https://pagure.io/fesco/issue/2583.
+
+* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sat Jul 04 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.4.1-2
+- Switch to the new CMake macros.
+
 * Mon Apr 27 2020 Vitaly Zaitsev <vitaly@easycoding.org> - 0.4.1-1
 - Updated to version 0.4.1.