From a64822697ce32551d228b038165fa4832ce593d6cb7b1a254321b857a5efc511 Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Thu, 12 Apr 2018 12:11:41 +0000
Subject: [PATCH] - Simplify spec file   * Drop support for building on older
 distros   * Trim describtion - Enable delayacct

OBS-URL: https://build.opensuse.org/package/show/Base:System/htop?expand=0&rev=49
---
 htop.changes |  8 ++++++++
 htop.spec    | 34 +++++++++-------------------------
 2 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/htop.changes b/htop.changes
index 872009b..4ab6eb4 100644
--- a/htop.changes
+++ b/htop.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Apr 12 12:09:09 UTC 2018 - mpluskal@suse.com
+
+- Simplify spec file
+  * Drop support for building on older distros
+  * Trim describtion
+- Enable delayacct
+
 -------------------------------------------------------------------
 Tue Apr 10 22:48:06 UTC 2018 - avindra@opensuse.org
 
diff --git a/htop.spec b/htop.spec
index 188d6fd..9c088f1 100644
--- a/htop.spec
+++ b/htop.spec
@@ -29,24 +29,21 @@ Source2:        %{name}.keyring
 Patch0:         htop-desktop-file-fix-thoenig-01.patch
 # PATCH-FIX-OPENSUSE htop-script-python3.patch
 Patch1:         htop-script-python3.patch
-BuildRequires:  ncurses-devel
+BuildRequires:  pkgconfig >= 0.9.0
 BuildRequires:  python3-base
 BuildRequires:  update-desktop-files
-Requires(post): update-desktop-files
-Requires(postun): update-desktop-files
+BuildRequires:  pkgconfig(libnl-3.0)
+BuildRequires:  pkgconfig(libnl-genl-3.0)
+BuildRequires:  pkgconfig(ncurses)
 Recommends:     lsof
 Recommends:     strace
 
 %description
-htop is an interactive text-mode process viewer for Linux. It aims to
-be a better 'top' and requires ncurses. It is tested with Linux 2.6,
-but is also reported to work (and was originally developed) with the
-2.4 series.
+htop is an interactive text-mode process viewer for Linux. It aims to be a
+better 'top' and requires ncurses.
 
 %prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
+%autosetup -p1
 
 %build
 %configure \
@@ -54,27 +51,14 @@ but is also reported to work (and was originally developed) with the
   --enable-unicode \
   --enable-linux-affinity \
   --enable-taskstats \
+  --enable-delayacct \
   --enable-cgroup
-# forcefully exclude -L/usr/lib(64)/ncurses5 from being added on systems with
-# version 6 of ncurses. probably a cleaner way to fix this.
-%if 0%{?suse_version} < 1500
-LIBS="-lncursesw -ltinfo -lm " make -e %{?_smp_mflags}
-%else
-make %{?_smp_mflags}
-%endif
+%make_build
 
 %install
 %make_install
 %suse_update_desktop_file -i %{name} System Monitor
 
-%if 0%{?suse_version} < 1500
-%post
-%desktop_database_post
-
-%postun
-%desktop_database_postun
-%endif
-
 %files
 %license COPYING
 %{_bindir}/%{name}