From bdc29b1420689cbaa72c96ec53f7565dd94a162fe1c3011d817727f3e249c43b Mon Sep 17 00:00:00 2001
From: Thorsten Kukuk <kukuk@suse.com>
Date: Wed, 21 Aug 2024 09:02:54 +0000
Subject: [PATCH] - Update to version 84.87+git20240821.fbabe1d:   * Add helper
 service for soft-reboot

OBS-URL: https://build.opensuse.org/package/show/Base:System/aaa_base?expand=0&rev=791
---
 .gitattributes                         |  2 +-
 _servicedata                           |  2 +-
 aaa_base-84.87+git20240809.5d13eb4.tar |  3 ---
 aaa_base-84.87+git20240821.fbabe1d.tar |  3 +++
 aaa_base.changes                       |  6 ++++++
 aaa_base.spec                          | 16 ++++++++++++++--
 6 files changed, 25 insertions(+), 7 deletions(-)
 delete mode 100644 aaa_base-84.87+git20240809.5d13eb4.tar
 create mode 100644 aaa_base-84.87+git20240821.fbabe1d.tar

diff --git a/.gitattributes b/.gitattributes
index b4e0228..61eabcf 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -24,4 +24,4 @@
 ## Specific LFS patterns
 aaa_base-84.87+git20240620.57ee9e1.tar filter=lfs diff=lfs merge=lfs -text
 aaa_base-84.87+git20240805.7513b28.tar filter=lfs diff=lfs merge=lfs -text
-aaa_base-84.87+git20240809.5d13eb4.tar filter=lfs diff=lfs merge=lfs -text
+aaa_base-84.87+git20240821.fbabe1d.tar filter=lfs diff=lfs merge=lfs -text
diff --git a/_servicedata b/_servicedata
index 0f7b75b..bcc12e3 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,5 +1,5 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/openSUSE/aaa_base.git</param>
-              <param name="changesrevision">5d13eb4bf0438b5c6c9624b64d1eda2fb2459112</param></service>
+              <param name="changesrevision">fbabe1d9dfff899e79fccf92703bbbbc20890e36</param></service>
 </servicedata>
\ No newline at end of file
diff --git a/aaa_base-84.87+git20240809.5d13eb4.tar b/aaa_base-84.87+git20240809.5d13eb4.tar
deleted file mode 100644
index eb9280d..0000000
--- a/aaa_base-84.87+git20240809.5d13eb4.tar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:28abbf17a1181a1cbaec00a43141a9337bddd49be6dc2637cdd95ff7aec795b6
-size 348160
diff --git a/aaa_base-84.87+git20240821.fbabe1d.tar b/aaa_base-84.87+git20240821.fbabe1d.tar
new file mode 100644
index 0000000..0fdba5f
--- /dev/null
+++ b/aaa_base-84.87+git20240821.fbabe1d.tar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:aca1408ed55ef2216e0046122a08162e2d757061509e78030e176886e60eebe0
+size 348160
diff --git a/aaa_base.changes b/aaa_base.changes
index 092552a..32173c9 100644
--- a/aaa_base.changes
+++ b/aaa_base.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Aug 21 08:51:24 UTC 2024 - kukuk@suse.com
+
+- Update to version 84.87+git20240821.fbabe1d:
+  * Add helper service for soft-reboot
+
 -------------------------------------------------------------------
 Fri Aug 09 13:44:32 UTC 2024 - kukuk@suse.com
 
diff --git a/aaa_base.spec b/aaa_base.spec
index 980caa3..4cc34fc 100644
--- a/aaa_base.spec
+++ b/aaa_base.spec
@@ -33,7 +33,7 @@ BuildRequires:  git-core
 %endif
 
 Name:           aaa_base
-Version:        84.87+git20240809.5d13eb4%{git_version}
+Version:        84.87+git20240821.fbabe1d%{git_version}
 Release:        0
 Summary:        openSUSE Base Package
 License:        GPL-2.0-or-later
@@ -154,6 +154,12 @@ mkdir -p %{buildroot}%{_fillupdir}
   rm -vrf %{buildroot}/usr/share/fillup-templates
 %endif
 
+%pre
+%service_add_pre soft-reboot-cleanup.service
+
+%preun
+%service_del_preun soft-reboot-cleanup.service
+
 %post
 export LC_ALL=C
 
@@ -169,6 +175,10 @@ fi
 
 %{fillup_only -n language}
 %{fillup_only -n proxy}
+%service_add_post soft-reboot-cleanup.service
+
+%postun
+%service_del_postun_without_restart soft-reboot-cleanup.service
 
 %pre extras
 %service_add_pre backup-rpmdb.service backup-rpmdb.timer backup-sysconfig.service backup-sysconfig.timer check-battery.service check-battery.timer
@@ -217,6 +227,8 @@ fi
 /usr/etc/profile.d/terminal.csh
 %dir /usr/lib/environment.d
 /usr/lib/environment.d/50-xdg.conf
+/usr/lib/systemd/system/soft-reboot-cleanup.service
+/usr/libexec/soft-reboot-cleanup
 %{_tmpfilesdir}/soft-reboot-cleanup.conf
 %config /etc/shells
 %ghost %dir /etc/init.d
@@ -247,7 +259,7 @@ fi
 /usr/lib/base-scripts/backup-rpmdb
 /usr/lib/base-scripts/backup-sysconfig
 /usr/lib/base-scripts/check-battery
-/usr/lib/systemd/system/*
+/usr/lib/systemd/system/[bc]*
 /var/adm/backup/rpmdb
 /var/adm/backup/sysconfig
 %{_fillupdir}/sysconfig.backup