Sync from SUSE:SLFO:Main suseconnect-ng revision 23172d9176883d2890575c2d1c9c53d0

This commit is contained in:
Adrian Schröter 2024-11-15 15:03:05 +01:00
parent b7d87aaf87
commit bc0e632455
6 changed files with 34 additions and 12 deletions

View File

@ -2,8 +2,8 @@
<service name="tar_scm" mode="manual">
<param name="scm">git</param>
<param name="url">https://github.com/SUSE/connect-ng.git</param>
<param name="revision">v1.12.0</param>
<param name="version">1.12.0</param>
<param name="revision">v1.13.0</param>
<param name="version">1.13.0</param>
<param name="filename">suseconnect-ng</param>
<param name="package-meta">no</param>
<param name="changesgenerate">disable</param>

BIN
suseconnect-ng-1.12.0.tar.xz (Stored with Git LFS)

Binary file not shown.

BIN
suseconnect-ng-1.13.0.tar.xz (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Thu Nov 14 11:01:05 UTC 2024 - Miquel Sabaté Solà <msabate@suse.com>
- Update version to 1.13:
- Integrating uptime-tracker
- Honor auto-import-gpg-keys flag on migration (bsc#1231328)
- Only send labels if targetting SCC
- Skip the docker auth generation on RMT (bsc#1231185)
- Add --set-labels to register command to set labels at registration time on SCC
- Add a new function to display suse-uptime-tracker version
- Integrate with uptime-tracker ( https://github.com/SUSE/uptime-tracker/ )
- Add a command to show the info being gathered
-------------------------------------------------------------------
Fri Sep 13 14:11:22 UTC 2024 - Miquel Sabate Sola <msabate@suse.com>

View File

@ -19,7 +19,7 @@
%global project github.com/SUSE/connect-ng
Name: suseconnect-ng
Version: 1.12.0
Version: 1.13.0
Release: 0
URL: https://github.com/SUSE/connect-ng
License: LGPL-2.1-or-later
@ -108,6 +108,7 @@ echo %{version} > internal/connect/version.txt
go build -v -ldflags "-s -w" -mod=vendor -buildmode=pie -o bin/suseconnect %{project}/cmd/suseconnect
go build -v -ldflags "-s -w" -mod=vendor -buildmode=pie -o bin/zypper-migration %{project}/cmd/zypper-migration
go build -v -ldflags "-s -w" -mod=vendor -buildmode=pie -o bin/zypper-search-packages %{project}/cmd/zypper-search-packages
go build -v -ldflags "-s -w" -mod=vendor -buildmode=pie -o bin/suse-uptime-tracker %{project}/cmd/suse-uptime-tracker
# the library
mkdir -p %_builddir/go/lib
@ -116,6 +117,7 @@ go build -v -ldflags "-s -w" -mod=vendor -buildmode=c-shared -o lib/libsuseconne
%install
# Install binary + symlinks
install -D -m 0755 bin/suseconnect %{buildroot}/%{_bindir}/suseconnect
install -D -m 0755 bin/suse-uptime-tracker %{buildroot}/%{_bindir}/suse-uptime-tracker
ln -s %{_bindir}/suseconnect %{buildroot}/%{_bindir}/SUSEConnect
install -d -m 0755 %{buildroot}/%{_sbindir}
@ -140,13 +142,16 @@ install -D -m 644 SUSEConnect.example %{buildroot}%{_sysconfdir}/SUSEConnect.exa
# Install the SUSEConnect --keepalive timer and service.
install -D -m 644 build/packaging/suseconnect-keepalive.timer %{buildroot}/%{_unitdir}/suseconnect-keepalive.timer
install -D -m 644 build/packaging/suseconnect-keepalive.service %{buildroot}/%{_unitdir}/suseconnect-keepalive.service
install -D -m 644 build/packaging/suse-uptime-tracker.timer %{buildroot}/%{_unitdir}/suse-uptime-tracker.timer
install -D -m 644 build/packaging/suse-uptime-tracker.service %{buildroot}/%{_unitdir}/suse-uptime-tracker.service
ln -sf service %{buildroot}/%{_sbindir}/rcsuseconnect-keepalive
ln -sf service %{buildroot}/%{_sbindir}/rcsuse-uptime-tracker
# 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
%service_add_pre suseconnect-keepalive.service suseconnect-keepalive.timer suse-uptime-tracker.service suse-uptime-tracker.timer
# in pre blocks the old version is still installed. This way we can detect
# if --keepalive was already present before
@ -198,13 +203,13 @@ fi
sed -i '/RandomizedDelaySec*/d' %{_unitdir}/suseconnect-keepalive.timer
sed -i "s/OnCalendar=daily/OnCalendar=*-*-* $TIMER_HOUR:$TIMER_MINUTE:00/" %{_unitdir}/suseconnect-keepalive.timer
%endif
%service_add_post suseconnect-keepalive.service suseconnect-keepalive.timer
%service_add_post suseconnect-keepalive.service suseconnect-keepalive.timer suse-uptime-tracker.service suse-uptime-tracker.timer
%preun
%service_del_preun suseconnect-keepalive.service suseconnect-keepalive.timer
%service_del_preun suseconnect-keepalive.service suseconnect-keepalive.timer suse-uptime-tracker.service suse-uptime-tracker.timer
%postun
%service_del_postun suseconnect-keepalive.service suseconnect-keepalive.timer
%service_del_postun suseconnect-keepalive.service suseconnect-keepalive.timer suse-uptime-tracker.service suse-uptime-tracker.timer
%posttrans
if [ -e /run/suseconnect-keepalive.timer.is-enabled ]; then
@ -220,15 +225,19 @@ fi
%license LICENSE LICENSE.LGPL
%doc README.md
%{_bindir}/suseconnect
%{_bindir}/suse-uptime-tracker
%{_bindir}/SUSEConnect
%{_sbindir}/SUSEConnect
%{_sbindir}/rcsuseconnect-keepalive
%{_sbindir}/rcsuse-uptime-tracker
/usr/lib/zypper/commands
%{_mandir}/man8/*
%{_mandir}/man5/*
%{_unitdir}/suseconnect-keepalive.service
%{_unitdir}/suseconnect-keepalive.timer
%config %{_sysconfdir}/SUSEConnect.example
%{_unitdir}/suse-uptime-tracker.service
%{_unitdir}/suse-uptime-tracker.timer
%files -n libsuseconnect
%license LICENSE LICENSE.LGPL

BIN
vendor.tar.xz (Stored with Git LFS)

Binary file not shown.