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/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 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 1ac608d..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,14 +31,23 @@ 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 # packages required only for hwinfo tests -%ifarch %ix86 ia64 x86_64 %arm aarch64 +%ifarch ia64 x86_64 %arm aarch64 BuildRequires: dmidecode %endif %ifarch s390x @@ -53,14 +62,14 @@ 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 -%ifarch %ix86 ia64 x86_64 %arm aarch64 +%ifarch ia64 x86_64 %arm aarch64 Requires: dmidecode %endif # ExclusiveArch from this package @@ -69,7 +78,7 @@ Requires: s390-tools %endif Requires: zypper # lscpu is only used on those -%ifarch x86_64 aarch64 +%ifarch aarch64 Requires: util-linux %endif Recommends: systemd @@ -146,7 +155,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=$?