From 822cb77d01c8248751f31015f07b843171e35ed99983e38b6f2903f42a23f327 Mon Sep 17 00:00:00 2001 From: Thomas Schmidt Date: Thu, 1 Dec 2022 17:29:10 +0000 Subject: [PATCH 1/5] OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:SCC/suseconnect-ng?expand=0&rev=45 --- suseconnect-ng.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/suseconnect-ng.spec b/suseconnect-ng.spec index 1ac608d..a7c85e5 100644 --- a/suseconnect-ng.spec +++ b/suseconnect-ng.spec @@ -72,6 +72,7 @@ Requires: zypper %ifarch x86_64 aarch64 Requires: util-linux %endif +ExcludeArch: %ix86 s390 ppc64 Recommends: systemd %description From a40189e00ac9e9de59b73b2aee4adea6c8a5c94d7fd8ef618751d242c7a06649 Mon Sep 17 00:00:00 2001 From: Thomas Schmidt Date: Tue, 6 Dec 2022 09:44:58 +0000 Subject: [PATCH 2/5] 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 From 7bf191c48be0054f8296c18c128d96aea2aa033b8528f3fd11513123284f9e63 Mon Sep 17 00:00:00 2001 From: Thomas Schmidt Date: Tue, 6 Dec 2022 10:17:19 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:SCC/suseconnect-ng?expand=0&rev=47 --- suseconnect-ng.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/suseconnect-ng.spec b/suseconnect-ng.spec index f5c9783..d083740 100644 --- a/suseconnect-ng.spec +++ b/suseconnect-ng.spec @@ -1,7 +1,7 @@ # # spec file for package suseconnect-ng # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # + %global provider_prefix github.com/SUSE/connect-ng %global import_path %{provider_prefix} @@ -22,7 +23,7 @@ %bcond_with hwinfo Name: suseconnect-ng -Version: 0.0.3~git112.d4980ea +Version: 1.0.0~git0.faee7c196dc1 Release: 0 URL: https://github.com/SUSE/connect-ng License: LGPL-2.1-or-later @@ -30,10 +31,10 @@ Summary: Utility to register a system with the SUSE Customer Center Group: System/Management Source: connect-ng-%{version}.tar.xz Source1: %name-rpmlintrc -BuildRequires: golang-packaging BuildRequires: go >= 1.16 -BuildRequires: zypper +BuildRequires: golang-packaging BuildRequires: ruby-devel +BuildRequires: zypper %if %{with hwinfo} %global test_hwinfo_args -test-hwinfo @@ -213,3 +214,5 @@ 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 \ No newline at end of file From 2876fbc5b1ee593c24b9178cef92c08e7170a43619f1d259373216f05814c07f Mon Sep 17 00:00:00 2001 From: Thomas Schmidt Date: Tue, 13 Dec 2022 13:02:02 +0000 Subject: [PATCH 4/5] - Update to version 1.0.0~git14.17a7901: * Don't write system_token to service credentials files * Allow non-root users to use --version * Add: ExcludeArch: %ix86 s390 ppc64 to the .spec file, so we skip builds for unsupported architectures. * Update Dockerfile.yast * Use openssl go for SLE and Leap 15.5+ builds * Fix keepalive feature notice during installation * Fix requires for all rhel clone distributions like alma, rocky... OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:SCC/suseconnect-ng?expand=0&rev=48 --- _servicedata | 2 +- suseconnect-ng.changes | 12 ++++++++++++ suseconnect-ng.spec | 23 +++++++++++++++-------- 3 files changed, 28 insertions(+), 9 deletions(-) diff --git a/_servicedata b/_servicedata index 0c4d0a3..a9a55f0 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/SUSE/connect-ng.git - faee7c196dc1f8ccd3a703c6f9980b28893639b4 \ No newline at end of file + 17a79019a857c17bd114523b699f2ba97da398a8 \ No newline at end of file diff --git a/suseconnect-ng.changes b/suseconnect-ng.changes index 3393c60..6b698cc 100644 --- a/suseconnect-ng.changes +++ b/suseconnect-ng.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Dec 13 12:57:16 UTC 2022 - tschmidt@suse.com + +- Update to version 1.0.0~git14.17a7901: + * Don't write system_token to service credentials files + * Allow non-root users to use --version + * Add: ExcludeArch: %ix86 s390 ppc64 to the .spec file, so we skip builds for unsupported architectures. + * Update Dockerfile.yast + * Use openssl go for SLE and Leap 15.5+ builds + * Fix keepalive feature notice during installation + * Fix requires for all rhel clone distributions like alma, rocky... + ------------------------------------------------------------------- Tue Nov 08 13:05:59 UTC 2022 - msabate@suse.com diff --git a/suseconnect-ng.spec b/suseconnect-ng.spec index d083740..7f8916b 100644 --- a/suseconnect-ng.spec +++ b/suseconnect-ng.spec @@ -23,7 +23,7 @@ %bcond_with hwinfo Name: suseconnect-ng -Version: 1.0.0~git0.faee7c196dc1 +Version: 1.0.0~git14.17a7901 Release: 0 URL: https://github.com/SUSE/connect-ng License: LGPL-2.1-or-later @@ -31,15 +31,21 @@ 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 +# use FIPS compliant go version for SLE targets and Leap 15.5+ targets +%if ( 0%{?is_opensuse} == 0 && 0%{?sle_version} ) || ( 0%{?is_opensuse} == 1 && 0%{?sle_version} >= 150500 ) +# temporary until BuildRequires: go-openssl >= 1.16 works +BuildRequires: go1.18-openssl +%else +BuildRequires: go >= 1.16 +%endif BuildRequires: ruby-devel BuildRequires: zypper %if %{with hwinfo} %global test_hwinfo_args -test-hwinfo -ExcludeArch: %ix86 s390 ppc64 +ExcludeArch: %ix86 s390 ppc64 # packages required only for hwinfo tests %ifarch ia64 x86_64 %arm aarch64 BuildRequires: dmidecode @@ -50,17 +56,16 @@ BuildRequires: s390-tools BuildRequires: systemd %endif - Obsoletes: SUSEConnect < 1.0.0 Provides: SUSEConnect = 1.0.0 Obsoletes: zypper-migration-plugin < 0.99 Provides: zypper-migration-plugin = 0.99 Obsoletes: zypper-search-packages-plugin < 0.99 Provides: zypper-search-packages-plugin = 0.99 -%if 0%{?fedora} || 0%{?rhel} || 0%{?centos_version} -Requires: ca-certificates -%else +%if 0%{?suse_version} Requires: ca-certificates-mozilla +%else +Requires: ca-certificates %endif Requires: coreutils # ExclusiveArch from this package @@ -93,6 +98,7 @@ 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. @@ -101,6 +107,7 @@ 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. @@ -215,4 +222,4 @@ make -C %_builddir/go/src/%import_path gofmt %doc yast/README.md %_libdir/ruby/vendor_ruby/%rb_ver/suse -%changelog \ No newline at end of file +%changelog From 1d96032efe7318c50a3df9344655337fb019a2221911b9f775adb33f7dd896f2 Mon Sep 17 00:00:00 2001 From: Thomas Schmidt Date: Tue, 13 Dec 2022 13:06:24 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:SCC/suseconnect-ng?expand=0&rev=49 --- connect-ng-1.0.0~git0.faee7c196dc1.tar.xz | 3 --- connect-ng-1.0.0~git14.17a7901.tar.xz | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 connect-ng-1.0.0~git0.faee7c196dc1.tar.xz create mode 100644 connect-ng-1.0.0~git14.17a7901.tar.xz diff --git a/connect-ng-1.0.0~git0.faee7c196dc1.tar.xz b/connect-ng-1.0.0~git0.faee7c196dc1.tar.xz deleted file mode 100644 index 0cb510c..0000000 --- a/connect-ng-1.0.0~git0.faee7c196dc1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8616831bb453de275bc540bd2dfc2cfa1432c82df05a8aaa63fe789b16a67c3a -size 78104 diff --git a/connect-ng-1.0.0~git14.17a7901.tar.xz b/connect-ng-1.0.0~git14.17a7901.tar.xz new file mode 100644 index 0000000..f19bea7 --- /dev/null +++ b/connect-ng-1.0.0~git14.17a7901.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4eef84bfa8978149b3f7f86512a7ada1814e4b5420d26c2c07d140a299581cb4 +size 78256