diff --git a/_servicedata b/_servicedata index b24d0be..fb8fae1 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/SUSE/connect-ng.git - 7497adf2078f1d8f9eb51ef90ec61f7bfb46c848 \ No newline at end of file + 75890b6d6cb41ce623cec1fd77f3c899e2625f88 \ No newline at end of file diff --git a/connect-ng-0.0.8~git2.368ea44.tar.xz b/connect-ng-0.0.8~git2.368ea44.tar.xz deleted file mode 100644 index c5d2b3a..0000000 --- a/connect-ng-0.0.8~git2.368ea44.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:727aae3f47a413796adde705174ca4531b28d4e591c68ccd7fd7a971f3616991 -size 777336 diff --git a/connect-ng-0.0.9~git5.75890b6.tar.xz b/connect-ng-0.0.9~git5.75890b6.tar.xz new file mode 100644 index 0000000..a219b8c --- /dev/null +++ b/connect-ng-0.0.9~git5.75890b6.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dbbc41a68503c1d8047e823599912eda262dd8851cd4c2c2b5da5dedf42b81b4 +size 831728 diff --git a/suseconnect-ng.changes b/suseconnect-ng.changes index d02fa21..a66281c 100644 --- a/suseconnect-ng.changes +++ b/suseconnect-ng.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Fri Aug 05 13:33:05 UTC 2022 - jan.suse@zerebecki.de + +- Update to version 0.0.9~git5.75890b6: + * Don't run keepalive on reboot + * Use system-wide proxy settings (bsc#1200994) + * Add customer information about keepalive calls + * Add timer for SUSEConnect --keepalive (bsc#1196076) + * Add --keepalive to manpage + * Added support for the System-Token header + * Add Keepalive command line option + * Print nested zypper errors (bsc#1200803) + * Fix migration json error with SMT (bsc#1198625) + * Add option to run local scc tests + * Switch to jenkins-hosted credentials + * Fix "VCS stamping" problem + * Add missing import + * Remove redundant code + add comment + ------------------------------------------------------------------- Wed Apr 20 08:18:01 UTC 2022 - jan.suse@zerebecki.de diff --git a/suseconnect-ng.spec b/suseconnect-ng.spec index 07eaa34..d2c8021 100644 --- a/suseconnect-ng.spec +++ b/suseconnect-ng.spec @@ -23,7 +23,7 @@ %global test_hwinfo 0 Name: suseconnect-ng -Version: 0.0.8~git2.368ea44 +Version: 0.0.9~git5.75890b6 Release: 0 URL: https://github.com/SUSE/connect-ng License: LGPL-2.1-or-later @@ -31,7 +31,6 @@ Summary: Utility to register a system with the SUSE Customer Center Group: System/Management Source: connect-ng-%{version}.tar.xz Source1: %name-rpmlintrc -BuildRequires: git BuildRequires: go >= 1.16 BuildRequires: golang-packaging BuildRequires: ruby-devel @@ -106,6 +105,8 @@ This package provides bindings needed to use libsuseconnect from Ruby scripts. %prep %setup -q -n connect-ng-%{version} +# keep git metadata but don't use it for "VCS stamping" +mv .git .git.bak %build find %_builddir/.. @@ -133,10 +134,62 @@ install -D -m 644 %_builddir/go/src/%import_path/man/SUSEConnect.8 %buildroot/%_ install -D -m 644 %_builddir/go/src/%import_path/man/zypper-migration.8 %buildroot/%_mandir/man8/zypper-migration.8 install -D -m 644 %_builddir/go/src/%import_path/man/zypper-search-packages.8 %buildroot/%_mandir/man8/zypper-search-packages.8 +# Install the SUSEConnect --keepalive timer and service. +install -D -m 644 %_builddir/go/src/%import_path/suseconnect-keepalive.timer %buildroot/%_unitdir/suseconnect-keepalive.timer +install -D -m 644 %_builddir/go/src/%import_path/suseconnect-keepalive.service %buildroot/%_unitdir/suseconnect-keepalive.service +ln -sf service %buildroot/%_sbindir/rcsuseconnect-keepalive + find %_builddir/.. # we currently do not ship the source for any go module rm -rf %buildroot/usr/share/go +%pre +%service_add_pre suseconnect-keepalive.service suseconnect-keepalive.timer + +# 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) +if [ $? -eq 0 ]; then + echo "$helptext" | grep -q keepalive + kainfo=$? +fi + +if [ $kainfo -ne 0 ]; then + cat << EOF +Empowering you with enriched system visibility in the SUSE Customer Center + +SUSE is committed to helping provide better insights into the consumption of +SUSE subscriptions regardless of where they are running; physical or virtual, +on-prem or in the cloud. + +SUSE has been working on several improvements to the SUSE Customer Center (SCC), +RMT, and SUSE Manager to provide a clearer picture of your system landscape: + +- SUSE Manager v4.1+ now sends system information to SCC. +- SCC now captures which products are activated on systems that sit behind RMT + or SMT. +- This update will enable your system to "ping" SCC/RMT daily to + confirm the system's active status. This will help you identify or filter out + systems in SCC that are no longer running or decommissioned. As always, the + choice is yours, you can disable the daily ping by disabling the + suseconnect-keepalive systemd timer. + +We will continue improving our products to make it easier for you to view and +manage your subscription consumption. As always, we'd love to hear your feedback +about these improvements and any ideas you might have. +EOF +fi + +%post +%service_add_post suseconnect-keepalive.service suseconnect-keepalive.timer + +%preun +%service_del_preun suseconnect-keepalive.service suseconnect-keepalive.timer + +%postun +%service_del_postun suseconnect-keepalive.service suseconnect-keepalive.timer + %check %gotest -v %import_path/internal/connect %{?test_hwinfo_args} %gotest -v %import_path/suseconnect @@ -148,9 +201,12 @@ make -C %_builddir/go/src/%import_path gofmt %_bindir/suseconnect %_bindir/SUSEConnect %_sbindir/SUSEConnect +%_sbindir/rcsuseconnect-keepalive /usr/lib/zypper/commands %_mandir/man8/* %_mandir/man5/* +%_unitdir/suseconnect-keepalive.service +%_unitdir/suseconnect-keepalive.timer %files -n libsuseconnect %license LICENSE LICENSE.LGPL