Sync from SUSE:SLFO:Main container-suseconnect revision f85e1df65b2defd9182f434488d3ac47

_service

@@ -1,18 +1,18 @@
 <services>
-    <service mode="disabled" name="tar_scm">
+    <service mode="manual" name="tar_scm">
         <param name="url">https://github.com/SUSE/container-suseconnect.git</param>
         <param name="scm">git</param>
         <param name="filename">container-suseconnect</param>
         <param name="exclude">.git</param>
-        <param name="versionformat">2.4.0</param>
-        <param name="revision">v2.4.0</param>
+        <param name="versionformat">2.5.0</param>
+        <param name="revision">v2.5.0</param>
     </service>
-    <service mode="disabled" name="recompress">
+    <service mode="manual" name="recompress">
         <param name="file">*.tar</param>
         <param name="compression">zst</param>
     </service>
-    <service mode="disabled" name="set_version"/>
-    <service mode="disabled" name="go_modules">
+    <service mode="manual" name="set_version"/>
+    <service mode="manual" name="go_modules">
         <param name="compression">zst</param>
     </service>
 </services>

container-suseconnect.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Tue Mar  5 20:58:41 UTC 2024 - Dirk Müller <dmueller@suse.com>
+
+- remove unnecessary packaging buildrequires
+
+-------------------------------------------------------------------
+Wed Feb 28 08:57:41 UTC 2024 - Dirk Müller <dmueller@suse.com>
+
+- update to 2.5.0:
+  * Upgrade to go 1.21
+  * Allow setting of SCC credentials via environment variables
+  * Bump github.com/urfave/cli/v2 from 2.25.7 to 2.27.1
+  * Use switch instead of else if construction
+  * Add system token header to query SCC subscriptions
+    (bsc#1219855)
+- run tests
+
 -------------------------------------------------------------------
 Thu Oct  5 12:52:42 UTC 2023 - Dirk Müller <dmueller@suse.com>
 

container-suseconnect.spec

@@ -1,7 +1,7 @@
 #
-# spec file
+# spec file for package container-suseconnect
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -22,7 +22,7 @@
 %global zypp_services %{zypp_path}/services
 %global zypp_urlresolver %{zypp_path}/urlresolver
 Name:           %{project}
-Version:        2.4.0
+Version:        2.5.0
 Release:        0
 Summary:        Provides access to repositories inside containers
 License:        Apache-2.0
@@ -31,10 +31,13 @@ URL:            https://%{import_path}
 Source0:        %{project}-%{version}.tar.zst
 Source1:        vendor.tar.zst
 Source2:        container-suseconnect-rpmlintrc
-BuildRequires:  golang-packaging
 BuildRequires:  libzypp > 9.34
 BuildRequires:  zstd
+%if 0%{?suse_version} == 1500
+BuildRequires:  go1.21-openssl
+%else
 BuildRequires:  golang(API) = 1.21
+%endif
 Requires:       libzypp > 9.34
 
 %description
@@ -42,10 +45,16 @@ container-suseconnect gives access to package repositories inside containers
 using the host machine entitlements.
 
 %prep
+%if 0%{?suse_version} && 0%{?suse_version} < 1500
+export TAR_OPTIONS="-I zstd"
+%endif
 %setup -q -n %{project}-%{version} -a1
 
 %build
-go build -o %{project} -mod=vendor -buildmode=pie -trimpath -ldflags="-s -w" ./cmd/container-suseconnect
+go build -tags enablecgo -o %{project} -mod=vendor -buildmode=pie -trimpath -ldflags="-s -w" ./cmd/container-suseconnect
+
+%check
+go test ./...
 
 %install
 install -D -m 755 %{project} %{buildroot}/%{_bindir}/%{project}