Updated to the latest changes on main

Setting back the _service file to follow `main` instead of a specifically pinned
commit sha.

OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:SCC/suseconnect-ng?expand=0&rev=70
This commit is contained in:
Miquel Sabate Sola 2023-09-12 10:58:21 +00:00 committed by Git OBS Bridge
parent e7ded23f2e
commit f36d353301
5 changed files with 15 additions and 6 deletions

View File

@ -7,7 +7,7 @@
<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">ae8ba1ea979da277824e8f905114a723ae66def1</param>
<param name="revision">main</param>
<param name="version">_auto_</param>
<param name="versionformat">@PARENT_TAG@~git@TAG_OFFSET@.%h</param>
<param name="filename">connect-ng</param>

View File

@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/SUSE/connect-ng.git</param>
<param name="changesrevision">ae8ba1ea979da277824e8f905114a723ae66def1</param></service></servicedata>
<param name="changesrevision">516a41694fe9fe46a73008c1408a2e58070c2a09</param></service></servicedata>

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f4f2ff41df7445a83025db74026829fb3415e212628518e05a7884af853444fe
size 83380

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e7612be9b564b34bdbf64b576548c8f389abbe041578c256f5d754e4b7b986be
size 86096

View File

@ -24,7 +24,7 @@
Name: suseconnect-ng
# the version will get set by the 'set_version' service
Version: 1.3.0~git0.ae8ba1e
Version: 1.3.0~git7.516a41694fe9
Release: 0
URL: https://github.com/SUSE/connect-ng
License: LGPL-2.1-or-later
@ -144,6 +144,7 @@ install -D -m 644 %_builddir/go/src/%import_path/man/SUSEConnect.5 %buildroot/%_
install -D -m 644 %_builddir/go/src/%import_path/man/SUSEConnect.8 %buildroot/%_mandir/man8/SUSEConnect.8
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 -D -m 644 %_builddir/go/src/%import_path/SUSEConnect.example %{buildroot}%_sysconfdir/SUSEConnect.example
# Install the SUSEConnect --keepalive timer and service.
install -D -m 644 %_builddir/go/src/%import_path/suseconnect-keepalive.timer %buildroot/%_unitdir/suseconnect-keepalive.timer
@ -200,6 +201,13 @@ if [ "$1" -eq 1 ]; then
fi
%post
# Randomize schedule time for SLES12. SLES12 systemd does not support RandomizedDelaySec.
%if (0%{?sle_version} > 0 && 0%{?sle_version} < 150000)
TIMER_HOUR=$(( RANDOM % 24 ))
TIMER_MINUTE=$(( RANDOM % 60 ))
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
%preun
@ -235,6 +243,7 @@ make -C %_builddir/go/src/%import_path gofmt
%_mandir/man5/*
%_unitdir/suseconnect-keepalive.service
%_unitdir/suseconnect-keepalive.timer
%config %{_sysconfdir}/SUSEConnect.example
%files -n libsuseconnect
%license LICENSE LICENSE.LGPL