From 4a90fa9a96dafe580b5fb07d9f3be087056c73285c3532140ef87f0245ee5962 Mon Sep 17 00:00:00 2001
From: Thomas Schmidt <tschmidt@suse.com>
Date: Tue, 13 Dec 2022 13:02:02 +0000
Subject: [PATCH] - 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 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/SUSE/connect-ng.git</param>
-              <param name="changesrevision">faee7c196dc1f8ccd3a703c6f9980b28893639b4</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">17a79019a857c17bd114523b699f2ba97da398a8</param></service></servicedata>
\ 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