From a40189e00ac9e9de59b73b2aee4adea6c8a5c94d7fd8ef618751d242c7a06649 Mon Sep 17 00:00:00 2001 From: Thomas Schmidt Date: Tue, 6 Dec 2022 09:44:58 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:SCC/suseconnect-ng?expand=0&rev=46 --- suseconnect-ng.spec | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/suseconnect-ng.spec b/suseconnect-ng.spec index a7c85e5..f5c9783 100644 --- a/suseconnect-ng.spec +++ b/suseconnect-ng.spec @@ -1,7 +1,7 @@ # # spec file for package suseconnect-ng # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # - %global provider_prefix github.com/SUSE/connect-ng %global import_path %{provider_prefix} @@ -23,7 +22,7 @@ %bcond_with hwinfo Name: suseconnect-ng -Version: 1.0.0~git0.faee7c196dc1 +Version: 0.0.3~git112.d4980ea Release: 0 URL: https://github.com/SUSE/connect-ng License: LGPL-2.1-or-later @@ -31,14 +30,17 @@ Summary: Utility to register a system with the SUSE Customer Center Group: System/Management Source: connect-ng-%{version}.tar.xz Source1: %name-rpmlintrc -BuildRequires: go >= 1.16 BuildRequires: golang-packaging -BuildRequires: ruby-devel +BuildRequires: go >= 1.16 BuildRequires: zypper +BuildRequires: ruby-devel + %if %{with hwinfo} %global test_hwinfo_args -test-hwinfo + +ExcludeArch: %ix86 s390 ppc64 # packages required only for hwinfo tests -%ifarch %ix86 ia64 x86_64 %arm aarch64 +%ifarch ia64 x86_64 %arm aarch64 BuildRequires: dmidecode %endif %ifarch s390x @@ -47,6 +49,7 @@ BuildRequires: s390-tools BuildRequires: systemd %endif + Obsoletes: SUSEConnect < 1.0.0 Provides: SUSEConnect = 1.0.0 Obsoletes: zypper-migration-plugin < 0.99 @@ -60,7 +63,7 @@ Requires: ca-certificates-mozilla %endif Requires: coreutils # ExclusiveArch from this package -%ifarch %ix86 ia64 x86_64 %arm aarch64 +%ifarch ia64 x86_64 %arm aarch64 Requires: dmidecode %endif # ExclusiveArch from this package @@ -69,10 +72,9 @@ Requires: s390-tools %endif Requires: zypper # lscpu is only used on those -%ifarch x86_64 aarch64 +%ifarch aarch64 Requires: util-linux %endif -ExcludeArch: %ix86 s390 ppc64 Recommends: systemd %description @@ -90,7 +92,6 @@ Summary: C interface to suseconnect-ng Group: System/Management # the CLI is not used by libsuseconnect but it has the same dependencies and it's easier to keep one list above Requires: suseconnect-ng - %description -n libsuseconnect This package contains library which provides C interface to selected suseconnect-ng functions. @@ -99,7 +100,6 @@ suseconnect-ng functions. Summary: Ruby bindings for libsuseconnect library Group: System/Management Requires: libsuseconnect - %description -n suseconnect-ruby-bindings This package provides bindings needed to use libsuseconnect from Ruby scripts. @@ -147,7 +147,7 @@ rm -rf %buildroot/usr/share/go # in pre blocks the old version is still installed. This way we can detect # if --keepalive was already present before kainfo=0 -helptext=$(SUSEConnect --help) +helptext=$(test -x "$(type -p SUSEConnect)" && SUSEConnect --help) if [ $? -eq 0 ]; then echo "$helptext" | grep -q keepalive kainfo=$? @@ -213,5 +213,3 @@ make -C %_builddir/go/src/%import_path gofmt %files -n suseconnect-ruby-bindings %doc yast/README.md %_libdir/ruby/vendor_ruby/%rb_ver/suse - -%changelog