From 54812f60fbb2ba816a099412bcf9e6859d8a07d9 Mon Sep 17 00:00:00 2001 From: Jakub Kadlcik Date: Thu, 21 May 2020 23:47:29 +0200 Subject: [PATCH] Update tracer to 0.7.2-3 --- .gitignore | 1 + sources | 2 +- tracer.spec | 80 ++++++++++++++++++++++++++++++++++++----------------- 3 files changed, 57 insertions(+), 26 deletions(-) diff --git a/.gitignore b/.gitignore index e07f11e..76c19b2 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /tracer-0.6.13.1.tar.gz /tracer-0.7.0.tar.gz /tracer-0.7.1.tar.gz +/tracer-0.7.2.tar.gz diff --git a/sources b/sources index f6ee1a9..2a2dd3e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tracer-0.7.1.tar.gz) = 37e3b08615445ab04573547f6ae77082fc145af3d695094c1db054c95719e465f20726db58be7c187cda850fc9c4157e16d5f59fa4008708ffc701ad5f03989a +SHA512 (tracer-0.7.2.tar.gz) = 9d89998952961e11b456e715e01ff5926fdce04a6df21fc898964e0b6efd4c20cc9a1e959912ed05f933a29948df86e3628cc96eedbf7e93572a4610cbe38e71 diff --git a/tracer.spec b/tracer.spec index b9ec2db..ee0e43e 100644 --- a/tracer.spec +++ b/tracer.spec @@ -1,4 +1,6 @@ -%if 0%{?rhel} && 0%{?rhel} <= 7 +%if 0%{?rhel} + +%if 0%{?rhel} <= 7 %bcond_without python2 %bcond_with python3 %bcond_with suggest @@ -8,9 +10,15 @@ %bcond_without suggest %endif +%else +%bcond_with python2 +%bcond_without python3 +%bcond_without suggest +%endif + Name: tracer -Version: 0.7.1 -Release: 8%{?dist} +Version: 0.7.2 +Release: 3 Summary: Finds outdated running applications in your system BuildArch: noarch @@ -24,6 +32,7 @@ Source0: %{name}-%{version}.tar.gz BuildRequires: asciidoc BuildRequires: gettext +BuildRequires: make %global _description \ Tracer determines which applications use outdated files and prints them. For\ @@ -51,14 +60,24 @@ Obsoletes: %{name} <= 0.6.11 BuildRequires: python2-devel BuildRequires: python2-sphinx %if 0%{?rhel} && 0%{?rhel} <= 7 +BuildRequires: python-beautifulsoup4 +BuildRequires: rpm-python +BuildRequires: python-lxml Requires: rpm-python Requires: python-beautifulsoup4 Requires: python-lxml %else +BuildRequires: python2-beautifulsoup4 +BuildRequires: python2-rpm Requires: python2-rpm Requires: python2-beautifulsoup4 Requires: python2-lxml %endif +BuildRequires: python2-nose +BuildRequires: python2-psutil +BuildRequires: python2-future +BuildRequires: dbus-python +Requires: dbus-python Requires: python2-psutil Requires: python2-setuptools Requires: python2-future @@ -80,6 +99,12 @@ Python 2 version. Summary: %{summary} BuildRequires: python3-devel BuildRequires: python3-sphinx +BuildRequires: python3-nose +BuildRequires: python3-psutil +BuildRequires: python3-future +BuildRequires: python3-beautifulsoup4 +BuildRequires: python3-dbus +BuildRequires: python3-rpm Requires: python3-rpm Requires: python3-beautifulsoup4 Requires: python3-psutil @@ -122,6 +147,17 @@ sed -i -e '1s|^#!.*$|#!%{__python3}|' bin/%{name}.py %endif make %{?_smp_mflags} man +%check +%if %{with python3} +nosetests-3 . +%else +%if 0%{?rhel} && 0%{?rhel} <= 7 +nosetests . +%else +nosetests-2 . +%endif +%endif + %install # @TODO use following macros # %%py2_install @@ -170,23 +206,24 @@ make DESTDIR=%{buildroot}%{_datadir} mo %changelog -* Fri Jan 31 2020 Fedora Release Engineering - 0.7.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild +* Thu May 21 2020 Jonathon Turel 0.7.2-3 +- Update tito releaser branches (frostyx@email.cz) +- Not build for python2 package for Fedora anymore (frostyx@email.cz) -* Thu Oct 03 2019 Miro Hrončok - 0.7.1-7 -- Rebuilt for Python 3.8.0rc1 (#1748018) +* Thu May 21 2020 Jonathon Turel 0.7.2-2 +- Fix build dependencies for EL7, EL8, F30 (jturel@gmail.com) -* Mon Aug 19 2019 Miro Hrončok - 0.7.1-6 -- Rebuilt for Python 3.8 - -* Sat Jul 27 2019 Fedora Release Engineering - 0.7.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 0.7.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Tue Jan 15 2019 Miro Hrončok - 0.7.1-3 -- Remove Python 2 subpackage (#1635604) +* Thu May 21 2020 Jonathon Turel 0.7.2-1 +- Use DNF on RHEL (jturel@gmail.com) +- Use PackageManager to determine kernel version (jturel@gmail.com) +- Use subprocess to check process path arguments (jturel@gmail.com) +- Find the right lxml version for Python 3.4 (jturel@gmail.com) +- Update Vagrantfile to use Fedora 30 (jturel@gmail.com) +- Ignore debug kernels when checking if kernel has been updated + (jturel@gmail.com) +- Add build dependency for nosetests (frostyx@email.cz) +- Run tests within the %%check phase (frostyx@email.cz) +- Update fedora branches (frostyx@email.cz) * Wed Jan 09 2019 Jakub Kadlčík 0.7.1-1 - Fix #116 - Support currrent versions of DNF (elyscape@gmail.com) @@ -194,13 +231,6 @@ make DESTDIR=%{buildroot}%{_datadir} mo - Fix #119 - Improve session detection logic to fix (elyscape@gmail.com) - Fix space, instead of tabs (#115) (JensKuehnel@users.noreply.github.com) - A lot of changes to spec file regarding python2/3 (seanokeeffe797@gmail.com) - -* Sat Jul 14 2018 Fedora Release Engineering - 0.7.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Jun 19 2018 Miro Hrončok - 0.7.0-2 -- Rebuilt for Python 3.7 - * Thu Apr 19 2018 Sean O'Keeffe 0.7.0-1 - Fixes #98 - Don't try appending `None`, helpers (seanokeeffe797@gmail.com) - Fixes #104 - Replace None with "" when sorting (seanokeeffe797@gmail.com)