From 44c4571e99ee80ceaed0e15caa0ee8c17a997b3acace58f1bdcb80c6e5c038b9 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 12 Oct 2020 10:28:01 +0000 Subject: [PATCH 1/4] OBS-URL: https://build.opensuse.org/package/show/utilities/cpu-x?expand=0&rev=4 --- cpu-x.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cpu-x.spec b/cpu-x.spec index 01ca610..eb3aba8 100644 --- a/cpu-x.spec +++ b/cpu-x.spec @@ -27,13 +27,14 @@ Source: https://github.com/X0rg/CPU-X/archive/v%version.tar.gz Patch1: no-no-pie.patch BuildRequires: cmake BuildRequires: gettext-tools +%ifarch %ix86 x86_64 BuildRequires: nasm +%endif BuildRequires: pkgconfig(gtk+-3.0) >= 3.12.0 BuildRequires: pkgconfig(libcpuid) >= 0.4.0 BuildRequires: pkgconfig(libpci) BuildRequires: pkgconfig(libprocps) BuildRequires: pkgconfig(ncursesw) -ExclusiveArch: %ix86 x86_64 Provides: bundled(dmidecode) = 3.2.20200417 %description From 1cc1af962c2411020f6cf7aa884309e42935c7adf120aed1d7fa1b6b1bcd2ed5 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 12 Oct 2020 13:12:12 +0000 Subject: [PATCH 2/4] split completions OBS-URL: https://build.opensuse.org/package/show/utilities/cpu-x?expand=0&rev=6 --- cpu-x.spec | 39 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/cpu-x.spec b/cpu-x.spec index eb3aba8..71ad0f0 100644 --- a/cpu-x.spec +++ b/cpu-x.spec @@ -43,6 +43,33 @@ and peripherals. It is similar to CPU-Z (Windows) and can be used in graphical mode by using GTK or in text-based mode by using NCurses. A dump mode is present from command line. +%package bash-completion +Summary: Bash completion for %name +Group: System/Shells +Supplements: (%name and bash-completion) +BuildArch: noarch + +%description bash-completion +Shell completion definitions from %name for %name. + +%package fish-completion +Summary: Bash completion for %name +Group: System/Shells +Supplements: (%name and fish) +BuildArch: noarch + +%description fish-completion +Shell completion definitions from %name for %name. + +%package zsh-completion +Summary: Bash completion for %name +Group: System/Shells +Supplements: (%name and zsh) +BuildArch: noarch + +%description zsh-completion +Shell completion definitions from %name for %name. + %prep %autosetup -p1 -n CPU-X-%version @@ -58,13 +85,19 @@ rm -Rf "%buildroot/%_datadir/polkit-1" "%buildroot/%_datadir/applications" %files -f %name.lang %_bindir/cpu-x %_libexecdir/cpu-x* -%_datadir/bash-completion/ %_datadir/cpu-x/ -%_datadir/fish/ %_datadir/icons/* %_datadir/glib-2.0/ %_datadir/metainfo/ -%_datadir/zsh/ %license COPYING +%files bash-completion +%_datadir/bash-completion/ + +%files fish-completion +%_datadir/fish/ + +%files zsh-completion +%_datadir/zsh/ + %changelog From 251ed4772eeb78c8ecb8da4f917c504269629482a3b08719b03fc6ee9023356b Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 12 Oct 2020 13:20:34 +0000 Subject: [PATCH 3/4] - Make powerpc builds possible. Split shell completions. OBS-URL: https://build.opensuse.org/package/show/utilities/cpu-x?expand=0&rev=7 --- cpu-x.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cpu-x.changes b/cpu-x.changes index 942c564..45487c2 100644 --- a/cpu-x.changes +++ b/cpu-x.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Oct 12 13:20:03 UTC 2020 - Jan Engelhardt + +- Make powerpc builds possible. Split shell completions. + ------------------------------------------------------------------- Sat Oct 10 10:00:06 UTC 2020 - Jan Engelhardt From 7ab8f5e9e6f262ea91a85c054a126122773c5018dd6d24be3394da5ef9f28804 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 13 Oct 2020 10:50:07 +0000 Subject: [PATCH 4/4] - Split language files to -lang subpackage. OBS-URL: https://build.opensuse.org/package/show/utilities/cpu-x?expand=0&rev=8 --- cpu-x.changes | 5 +++++ cpu-x.spec | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/cpu-x.changes b/cpu-x.changes index 45487c2..8745576 100644 --- a/cpu-x.changes +++ b/cpu-x.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 13 10:48:54 UTC 2020 - Jan Engelhardt + +- Split language files to -lang subpackage. + ------------------------------------------------------------------- Mon Oct 12 13:20:03 UTC 2020 - Jan Engelhardt diff --git a/cpu-x.spec b/cpu-x.spec index 71ad0f0..959e579 100644 --- a/cpu-x.spec +++ b/cpu-x.spec @@ -70,6 +70,7 @@ BuildArch: noarch %description zsh-completion Shell completion definitions from %name for %name. +%lang_package %prep %autosetup -p1 -n CPU-X-%version @@ -82,7 +83,7 @@ Shell completion definitions from %name for %name. rm -Rf "%buildroot/%_datadir/polkit-1" "%buildroot/%_datadir/applications" %find_lang %name -%files -f %name.lang +%files %_bindir/cpu-x %_libexecdir/cpu-x* %_datadir/cpu-x/ @@ -97,6 +98,8 @@ rm -Rf "%buildroot/%_datadir/polkit-1" "%buildroot/%_datadir/applications" %files fish-completion %_datadir/fish/ +%files lang -f %name.lang + %files zsh-completion %_datadir/zsh/