From 3ec7da94bfdb78e25dfcd8b34b6f3ab000158ddcf8407caf529300dfbf2c0271 Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Tue, 22 May 2018 08:41:08 +0000 Subject: [PATCH] - Update to version 3.0.10. OBS-URL: https://build.opensuse.org/package/show/utilities/inxi?expand=0&rev=26 --- inxi-2.3.40.tar.gz | 3 --- inxi-3.0.10-1.tar.gz | 3 +++ inxi.changes | 7 +++++++ inxi.spec | 46 ++++++++++++++++++++++++++++++++++---------- 4 files changed, 46 insertions(+), 13 deletions(-) delete mode 100644 inxi-2.3.40.tar.gz create mode 100644 inxi-3.0.10-1.tar.gz diff --git a/inxi-2.3.40.tar.gz b/inxi-2.3.40.tar.gz deleted file mode 100644 index dd99830..0000000 --- a/inxi-2.3.40.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c961694f61868c57bff74e09ebbbbbea476ff268f515fba6e9ebe52ae84f2d79 -size 459144 diff --git a/inxi-3.0.10-1.tar.gz b/inxi-3.0.10-1.tar.gz new file mode 100644 index 0000000..11f85e0 --- /dev/null +++ b/inxi-3.0.10-1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f09f6d69d961b7bc53e7457fc3f8e7e86e1bd34b2a4dd1e6aa38f436d9e5c855 +size 240350 diff --git a/inxi.changes b/inxi.changes index 34540d8..ae472e9 100644 --- a/inxi.changes +++ b/inxi.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue May 22 07:20:12 UTC 2018 - sor.alexei@meowr.ru + +- Update to version 3.0.10: + * See /usr/share/doc/packages/inxi/inxi.changelog +- Add additional requirements (boo#1085951). + ------------------------------------------------------------------- Wed Oct 18 06:17:40 UTC 2017 - aavindraa@gmail.com diff --git a/inxi.spec b/inxi.spec index 3e92d1c..883e9b6 100644 --- a/inxi.spec +++ b/inxi.spec @@ -1,7 +1,7 @@ # # spec file for package inxi # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2011-2016 Malcolm J Lewis # # All modifications and additions to the file contributed by third parties @@ -17,16 +17,37 @@ # -%define _rev 6c73ce7c59031f42fde721c03e510b631c7dafb3 +%define _version 3.0.10-1 Name: inxi -Version: 2.3.40 +Version: 3.0.10 Release: 0 Summary: A system information script -License: GPL-3.0+ +License: GPL-3.0-or-later Group: System/Console -Url: https://github.com/smxi/inxi -Source: https://github.com/smxi/%{name}/archive/%{_rev}.tar.gz#/%{name}-%{version}.tar.gz -Requires: bash +URL: https://github.com/smxi/inxi +Source: https://github.com/smxi/inxi/archive/%{_version}.tar.gz#/%{name}-%{_version}.tar.gz +Requires: pciutils +Requires: procps +Requires: util-linux +Recommends: Mesa-demo-x +Recommends: bind-utils +Recommends: dmidecode +Recommends: iproute2 +Recommends: kmod-compat +Recommends: sensors +Recommends: tree +Recommends: usbutils +Recommends: perl(Cpanel::JSON::XS) +Recommends: perl(Time::HiRes) +Recommends: perl(XML::Dumper) +Suggests: curl +Suggests: freeipmi +Suggests: hddtemp +Suggests: sudo +Supplements: packageand(wmctrl:xorg-x11-server) +Supplements: packageand(xdpyinfo:xorg-x11-server) +Supplements: packageand(xprop:xorg-x11-server) +Supplements: packageand(xrandr:xorg-x11-server) %if 0%{?suse_version} >= 1120 BuildArch: noarch %else @@ -39,8 +60,8 @@ infobash. The primary purpose of inxi is for support, and sys admin use. inxi is used widely for forum and IRC support. %prep -%setup -q -n %{name}-%{_rev} -chmod 0644 inxi.changelog README.txt +%setup -q -n %{name}-%{_version} +sed -i '/^#!/s/env \(.*\)$/\1/' %{name} %build # Nothing to build. @@ -50,8 +71,13 @@ install -Dpm 0755 %{name} %{buildroot}%{_bindir}/%{name} install -Dpm 0644 %{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1 %files +%if 0%{?suse_version} >= 1500 +%license LICENSE.txt +%else %defattr(-,root,root) -%doc inxi.changelog LICENSE.txt README.txt +%doc LICENSE.txt +%endif +%doc inxi.changelog README.txt %{_bindir}/%{name} %{_mandir}/man1/%{name}.1%{?ext_man}