From a7bbdc3c42c657573f672ea8192150237c79d1ca Mon Sep 17 00:00:00 2001 From: Scott Bradnick Date: Thu, 7 Oct 2021 13:28:24 +0000 Subject: [PATCH 1/2] Accepting request 923387 from home:seife:testing allow build on 15.3, improve filelist (no more "files listed twice...") OBS-URL: https://build.opensuse.org/request/show/923387 OBS-URL: https://build.opensuse.org/package/show/Base:System/btop?expand=0&rev=5 --- btop.changes | 6 ++++++ btop.spec | 15 ++++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/btop.changes b/btop.changes index d2d11b2..fd4704d 100644 --- a/btop.changes +++ b/btop.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Oct 2 09:54:55 UTC 2021 - Stefan Seyfried + +- allow to build on 15.3 also +- improve filelist (no more "files listed twice...") + ------------------------------------------------------------------- Wed Sep 29 20:57:08 UTC 2021 - Scott Bradnick diff --git a/btop.spec b/btop.spec index a9fc5c0..df1fe63 100644 --- a/btop.spec +++ b/btop.spec @@ -24,8 +24,13 @@ License: Apache-2.0 URL: https://github.com/aristocratos/btop/archive Source: %{url}/v%{version}.tar.gz#/v%{version}.tar.gz BuildRequires: coreutils -BuildRequires: gcc11 -BuildRequires: gcc11-c++ +%if 0%{?suse_version} < 1550 +%define cxxopt CXX=g++-10 +BuildRequires: gcc10-c++ +%else +%define cxxopt %{nil} +BuildRequires: gcc-c++ >= 11 +%endif BuildRequires: sed %description @@ -35,16 +40,16 @@ Resource monitor that shows usage and stats for processor, memory, disks, networ %setup -q %build -%make_build +%make_build %{cxxopt} %install %make_install PREFIX=/usr %files /usr/bin/btop -/usr/share/btop +%dir /usr/share/btop +%dir /usr/share/btop/themes /usr/share/btop/README.md -/usr/share/btop/themes /usr/share/btop/themes/*.theme %license LICENSE %doc CHANGELOG.md From b389ee39b803f3bff4bc1bf6c6724c02ec6cac7c Mon Sep 17 00:00:00 2001 From: Scott Bradnick Date: Thu, 7 Oct 2021 14:11:28 +0000 Subject: [PATCH 2/2] Accepting request 923780 from home:sbradnick:branches:Base:System - Updating to version 1.0.14 ... OBS-URL: https://build.opensuse.org/request/show/923780 OBS-URL: https://build.opensuse.org/package/show/Base:System/btop?expand=0&rev=6 --- btop.changes | 5 +++++ btop.spec | 2 +- v1.0.11.tar.gz | 3 --- v1.0.14.tar.gz | 3 +++ 4 files changed, 9 insertions(+), 4 deletions(-) delete mode 100644 v1.0.11.tar.gz create mode 100644 v1.0.14.tar.gz diff --git a/btop.changes b/btop.changes index fd4704d..fb13fb3 100644 --- a/btop.changes +++ b/btop.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 7 13:57:15 UTC 2021 - Scott Bradnick + +- Updating to version 1.0.14 ... + ------------------------------------------------------------------- Sat Oct 2 09:54:55 UTC 2021 - Stefan Seyfried diff --git a/btop.spec b/btop.spec index df1fe63..4b0dfc1 100644 --- a/btop.spec +++ b/btop.spec @@ -17,7 +17,7 @@ Name: btop -Version: 1.0.11 +Version: 1.0.14 Release: 0 Summary: Usage and stats for processor, memory, disks, network and processes License: Apache-2.0 diff --git a/v1.0.11.tar.gz b/v1.0.11.tar.gz deleted file mode 100644 index 9bcbb59..0000000 --- a/v1.0.11.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0029481662bd91588d7ff1da9518c22cf9182bb22786681c74a1fd6728e6ab9b -size 924227 diff --git a/v1.0.14.tar.gz b/v1.0.14.tar.gz new file mode 100644 index 0000000..73e2a19 --- /dev/null +++ b/v1.0.14.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5b54e329bdacea109b4206506b3cafd9959b2ecc63ef9b04554bf9c7bc7b2b9b +size 925702