#1 Fix python deps for epel 8
Merged 2 months ago by maxamillion. Opened 2 months ago by pgreco.
rpms/ pgreco/htop master  into  master

file modified
+12 -1

@@ -1,6 +1,6 @@ 

  Name: htop

  Version: 2.2.0

- Release: 4%{?dist}

+ Release: 5%{?dist}

  Summary: Interactive process viewer

  License: GPLv2+

  URL: http://hisham.hm/htop/

@@ -8,7 +8,12 @@ 

  

  BuildRequires: desktop-file-utils

  BuildRequires: ncurses-devel

+ %if 0%{?rhel} >= 8

+ BuildRequires: platform-python

+ BuildRequires: /usr/bin/pathfix.py

+ %else

  BuildRequires: python

+ %endif

  BuildRequires: libtool

  

  %description

@@ -18,6 +23,9 @@ 

  %prep

  %autosetup

  sed -i s#"INSTALL_DATA = @INSTALL_DATA@"#"INSTALL_DATA = @INSTALL_DATA@ -p"# Makefile.in

+ %if 0%{?rhel} >= 8

+ pathfix.py -pni "/usr/libexec/platform-python" scripts/

+ %endif

  

  # fix parsing -s on the command line

  # https://github.com/hishamhm/htop/pull/790/commits/9d03d6178c23e6ebd5dd67339466e0a7e0d1d1a8

@@ -48,6 +56,9 @@ 

  %{_mandir}/man1/htop.1*

  

  %changelog

+ * Tue Jun 25 2019 Pablo Greco <pgreco@centosproject.org> - 2.2.0-5

+ - Fix python deps for epel 8

+ 

  * Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-4

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

  

Pull-Request has been merged by maxamillion

2 months ago
Metadata