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

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Oct  2 09:54:55 UTC 2021 - Stefan Seyfried <seife+obs@b1-systems.com>
+
+- allow to build on 15.3 also
+- improve filelist (no more "files listed twice...")
+
 -------------------------------------------------------------------
 Wed Sep 29 20:57:08 UTC 2021 - Scott Bradnick <scott.bradnick@suse.com>
 

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