From 481237bdf4930450dcd67c8a78e1ce410354ccab Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Tue, 28 Apr 2020 13:52:05 +0200 Subject: [PATCH 1/7] "Adding package.cfg file" --- package.cfg | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 package.cfg diff --git a/package.cfg b/package.cfg new file mode 100644 index 0000000..66ea79d --- /dev/null +++ b/package.cfg @@ -0,0 +1,2 @@ +[koji] +targets = epel8 epel8-playground \ No newline at end of file From cf2e46345b2f7bc105009bd7c1fb3fee1ccc658b Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Thu, 24 Sep 2020 16:13:48 +0000 Subject: [PATCH 2/7] remove package.cfg per new epel-playground policy --- package.cfg | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 package.cfg diff --git a/package.cfg b/package.cfg deleted file mode 100644 index 66ea79d..0000000 --- a/package.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[koji] -targets = epel8 epel8-playground \ No newline at end of file From 83460f8298d737abdcaf64f8c1b31e0714ef3255 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Thu, 1 Apr 2021 20:24:36 +0200 Subject: [PATCH 3/7] Fixed build on EPEL8. --- zswap-cli.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/zswap-cli.spec b/zswap-cli.spec index 6ca7ded..2e42abf 100644 --- a/zswap-cli.spec +++ b/zswap-cli.spec @@ -26,6 +26,7 @@ ZSwap-cli is a command-line tool to control zswap options. %prep %autosetup +sed -e 's/VERSION 3.12/VERSION 3.11/g' -e '/HOMEPAGE_URL/d' -i CMakeLists.txt %build %cmake -G Ninja \ From adfffd6dd08ec954fe35bc6fe7e65b13925fadfa Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Thu, 1 Apr 2021 20:44:45 +0200 Subject: [PATCH 4/7] Added patch with EPEL8 fixes. --- zswap-cli-epel-fixes.patch | 30 ++++++++++++++++++++++++++++++ zswap-cli.spec | 4 ++-- 2 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 zswap-cli-epel-fixes.patch diff --git a/zswap-cli-epel-fixes.patch b/zswap-cli-epel-fixes.patch new file mode 100644 index 0000000..006ef00 --- /dev/null +++ b/zswap-cli-epel-fixes.patch @@ -0,0 +1,30 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 807b899..cc25019 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -4,12 +4,11 @@ + # SPDX-License-Identifier: MIT + # + +-cmake_minimum_required(VERSION 3.12) ++cmake_minimum_required(VERSION 3.11) + + project(zswap-cli + VERSION 0.5.0 + DESCRIPTION "Command-line tool to control zswap options" +- HOMEPAGE_URL "https://github.com/xvitaly/zswap-cli" + LANGUAGES CXX + ) + +diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt +index 4967afc..2f421d5 100644 +--- a/src/app/CMakeLists.txt ++++ b/src/app/CMakeLists.txt +@@ -22,6 +22,7 @@ set(EXTERNAL_LIBS + ${LIB_NAME} + fmt::fmt + Boost::program_options ++ stdc++fs + ) + + add_executable(${APP_NAME} ${INTERNAL_LIBS}) diff --git a/zswap-cli.spec b/zswap-cli.spec index 2e42abf..e6752d1 100644 --- a/zswap-cli.spec +++ b/zswap-cli.spec @@ -8,6 +8,7 @@ Summary: Command-line tool to control zswap options License: MIT URL: https://github.com/xvitaly/%{name} Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz +Patch0: %{name}-epel-fixes.patch BuildRequires: boost-devel BuildRequires: cmake @@ -25,8 +26,7 @@ BuildRequires: systemd ZSwap-cli is a command-line tool to control zswap options. %prep -%autosetup -sed -e 's/VERSION 3.12/VERSION 3.11/g' -e '/HOMEPAGE_URL/d' -i CMakeLists.txt +%autosetup -p1 %build %cmake -G Ninja \ From ed91dbe2f0920c160ba820847cd301440a53a2ad Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Tue, 7 Dec 2021 12:38:11 +0100 Subject: [PATCH 5/7] Updated patch. --- zswap-cli-epel-fixes.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zswap-cli-epel-fixes.patch b/zswap-cli-epel-fixes.patch index 006ef00..3cda9be 100644 --- a/zswap-cli-epel-fixes.patch +++ b/zswap-cli-epel-fixes.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 807b899..cc25019 100644 +index de6b6c1..858c256 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,12 +4,11 @@ @@ -10,7 +10,7 @@ index 807b899..cc25019 100644 +cmake_minimum_required(VERSION 3.11) project(zswap-cli - VERSION 0.5.0 + VERSION 0.6.0 DESCRIPTION "Command-line tool to control zswap options" - HOMEPAGE_URL "https://github.com/xvitaly/zswap-cli" LANGUAGES CXX From fe3e0a385b6edae22d41776eb961e996bb43d167 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Tue, 28 Dec 2021 09:36:22 +0100 Subject: [PATCH 6/7] Removed no longer needed patch. --- zswap-cli-epel-fixes.patch | 30 ------------------------------ zswap-cli.spec | 2 +- 2 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 zswap-cli-epel-fixes.patch diff --git a/zswap-cli-epel-fixes.patch b/zswap-cli-epel-fixes.patch deleted file mode 100644 index 3cda9be..0000000 --- a/zswap-cli-epel-fixes.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index de6b6c1..858c256 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -4,12 +4,11 @@ - # SPDX-License-Identifier: MIT - # - --cmake_minimum_required(VERSION 3.12) -+cmake_minimum_required(VERSION 3.11) - - project(zswap-cli - VERSION 0.6.0 - DESCRIPTION "Command-line tool to control zswap options" -- HOMEPAGE_URL "https://github.com/xvitaly/zswap-cli" - LANGUAGES CXX - ) - -diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt -index 4967afc..2f421d5 100644 ---- a/src/app/CMakeLists.txt -+++ b/src/app/CMakeLists.txt -@@ -22,6 +22,7 @@ set(EXTERNAL_LIBS - ${LIB_NAME} - fmt::fmt - Boost::program_options -+ stdc++fs - ) - - add_executable(${APP_NAME} ${INTERNAL_LIBS}) diff --git a/zswap-cli.spec b/zswap-cli.spec index 7bc7c50..c1f10b7 100644 --- a/zswap-cli.spec +++ b/zswap-cli.spec @@ -8,7 +8,6 @@ Summary: Command-line tool to control zswap options License: MIT URL: https://github.com/xvitaly/%{name} Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz -Patch0: %{name}-epel-fixes.patch BuildRequires: boost-devel BuildRequires: cmake @@ -28,6 +27,7 @@ BuildRequires: systemd %prep %autosetup -p1 +sed -e 's/VERSION 3.11/VERSION 3.12/g' -e '/HOMEPAGE_URL/d' -i CMakeLists.txt %build %cmake -G Ninja \ From 333998e544f74c7b2517510b918c059335e0188b Mon Sep 17 00:00:00 2001 From: Package Retirement Date: Thu, 8 Jun 2023 10:32:22 +0200 Subject: [PATCH 7/7] Retired EPEL branch. --- .gitignore | 7 --- README.md | 3 -- dead.package | 1 + sources | 1 - zswap-cli.spec | 133 ------------------------------------------------- 5 files changed, 1 insertion(+), 144 deletions(-) delete mode 100644 .gitignore delete mode 100644 README.md create mode 100644 dead.package delete mode 100644 sources delete mode 100644 zswap-cli.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 9ba774d..0000000 --- a/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/zswap-cli-0.4.1.tar.gz -/zswap-cli-0.5.0.tar.gz -/zswap-cli-0.6.0.tar.gz -/zswap-cli-0.7.0.tar.gz -/zswap-cli-0.8.0.tar.gz -/zswap-cli-0.9.0.tar.gz -/zswap-cli-0.9.1.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 3b7495b..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# zswap-cli - -The zswap-cli package \ No newline at end of file diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..f5298be --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Retired EPEL branch. diff --git a/sources b/sources deleted file mode 100644 index 2f2f1e2..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (zswap-cli-0.9.1.tar.gz) = e2a7c3264aff0a2b239912869328e9cea83436ff40d37a62af478ae0a1888af221b50f63335387761bf191c7cf81ba500d1a559e39d3c37cbd90ad4c04fa6de5 diff --git a/zswap-cli.spec b/zswap-cli.spec deleted file mode 100644 index c58f364..0000000 --- a/zswap-cli.spec +++ /dev/null @@ -1,133 +0,0 @@ -Name: zswap-cli -Version: 0.9.1 -Release: 1%{?dist} - -Summary: Command-line tool to control zswap options -License: MIT -URL: https://github.com/xvitaly/%{name} -Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz - -BuildRequires: boost-devel -BuildRequires: cmake -BuildRequires: fmt-devel -BuildRequires: gcc-c++ -BuildRequires: glibc-headers -BuildRequires: kernel-headers -BuildRequires: ninja-build -BuildRequires: pandoc -BuildRequires: semver-devel -BuildRequires: systemd - -%{?systemd_requires} - -%description -Zswap-cli is a command-line tool to control zswap Linux kernel module -options. - -Zswap is a compressed cache for swap pages. It takes pages that are in the -process of being swapped out to disk and tries to compress them into a -RAM-based memory pool with dynamic allocation. - -It trades CPU cycles for a significant performance boost since reading from -a compressed cache is much faster than reading from a swap device. - -%prep -%autosetup -p1 -sed -e 's/VERSION 3.11/VERSION 3.12/g' -e '/HOMEPAGE_URL/d' -i CMakeLists.txt - -%build -%cmake -G Ninja \ - -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_DOCS:BOOL=OFF \ - -DBUILD_MANPAGE:BOOL=ON \ - -DSYSTEMD_INTEGRATION:BOOL=ON -%cmake_build - -%post -%systemd_post %{name}.service - -%preun -%systemd_preun %{name}.service - -%postun -%systemd_postun_with_restart %{name}.service - -%install -%cmake_install - -%files -%doc docs/* -%license LICENSE -%{_sbindir}/%{name} -%{_unitdir}/%{name}.service -%{_mandir}/man1/%{name}.* -%dir %{_sysconfdir}/%{name} -%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf - -%changelog -* Sun Oct 02 2022 Vitaly Zaitsev - 0.9.1-1 -- Updated to version 0.9.1. - -* Sat Jul 23 2022 Fedora Release Engineering - 0.9.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sun Jul 10 2022 Vitaly Zaitsev - 0.9.0-3 -- Rebuilt due to fmt library update. - -* Wed May 04 2022 Thomas Rodgers - 0.9.0-2 -- Rebuilt for Boost 1.78 - -* Wed Mar 02 2022 Vitaly Zaitsev - 0.9.0-1 -- Updated to version 0.9.0. - -* Sat Feb 12 2022 Vitaly Zaitsev - 0.8.0-1 -- Updated to version 0.8.0. - -* Sat Jan 22 2022 Fedora Release Engineering - 0.7.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Dec 22 2021 Vitaly Zaitsev - 0.7.0-1 -- Updated to version 0.7.0. - -* Tue Dec 07 2021 Vitaly Zaitsev - 0.6.0-1 -- Updated to version 0.6.0. - -* Sat Aug 07 2021 Jonathan Wakely - 0.5.0-4 -- Rebuilt for Boost 1.76 - -* Fri Jul 23 2021 Fedora Release Engineering - 0.5.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Sun Jul 04 2021 Vitaly Zaitsev - 0.5.0-2 -- Rebuilt due to fmt library update. - -* Thu Apr 01 2021 Vitaly Zaitsev - 0.5.0-1 -- Updated to version 0.5.0. - -* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 0.4.1-5 -- Rebuilt for updated systemd-rpm-macros - See https://pagure.io/fesco/issue/2583. - -* Thu Jan 28 2021 Fedora Release Engineering - 0.4.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 0.4.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Sat Jul 04 2020 Igor Raits - 0.4.1-2 -- Switch to the new CMake macros. - -* Mon Apr 27 2020 Vitaly Zaitsev - 0.4.1-1 -- Updated to version 0.4.1. - -* Sun Apr 26 2020 Vitaly Zaitsev - 0.4.0-1 -- Updated to version 0.4.0. - -* Wed Apr 22 2020 Vitaly Zaitsev - 0.3.0-1 -- Updated to version 0.3.0. - -* Mon Apr 13 2020 Vitaly Zaitsev - 0.2.0-1 -- Updated to version 0.2.0. - -* Sat Apr 04 2020 Vitaly Zaitsev - 0.1.0-1 -- Initial SPEC release.