From c8d8d77813a5f83ac4735d761fe959798a9fd53ea5e972c466a15325ff23762b Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Sat, 11 Sep 2021 20:24:24 +0000
Subject: [PATCH] Accepting request 917715 from devel:kubic

- Update to version 2.12
  - Remove special MicroOS firstboot script
  - Remove locale-check, replaced by another aaa_base implementation

OBS-URL: https://build.opensuse.org/request/show/917715
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/microos-tools?expand=0&rev=18
---
 microos-tools-2.11.tar.xz |  3 ---
 microos-tools-2.12.tar.xz |  3 +++
 microos-tools-rpmlintrc   |  7 +------
 microos-tools.changes     |  7 +++++++
 microos-tools.spec        | 31 +++++++++++++++++--------------
 5 files changed, 28 insertions(+), 23 deletions(-)
 delete mode 100644 microos-tools-2.11.tar.xz
 create mode 100644 microos-tools-2.12.tar.xz

diff --git a/microos-tools-2.11.tar.xz b/microos-tools-2.11.tar.xz
deleted file mode 100644
index 95a516a..0000000
--- a/microos-tools-2.11.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e7c66b87aac9e25c74ec987d5cd9d8cf46ce08edae0092ce1d5931aa2dcff9f7
-size 79088
diff --git a/microos-tools-2.12.tar.xz b/microos-tools-2.12.tar.xz
new file mode 100644
index 0000000..972adc7
--- /dev/null
+++ b/microos-tools-2.12.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:95444bd942ee62efa13640720c7044819b5344c9fc9329a38c8dd164fedcb8ce
+size 75988
diff --git a/microos-tools-rpmlintrc b/microos-tools-rpmlintrc
index 501655f..33a3cad 100644
--- a/microos-tools-rpmlintrc
+++ b/microos-tools-rpmlintrc
@@ -1,7 +1,2 @@
-addFilter('suse-filelist-forbidden-systemd-userdirs')
-addFilter('systemd-unit-in-etc')
-addFilter('dangling-symlink')
-addFilter('postin-without-tmpfile-creation')
+addFilter('post-without-tmpfile-creation')
 addFilter('tmpfile-not-in-filelist')
-addFilter('suse-missing-rclink')
-addFilter('.*W: systemd-service-without-service.*MicroOS-firstboot.service.*')
diff --git a/microos-tools.changes b/microos-tools.changes
index 5ac73fd..3f21d87 100644
--- a/microos-tools.changes
+++ b/microos-tools.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Sep  9 11:45:19 UTC 2021 - Thorsten Kukuk <kukuk@suse.com>
+
+- Update to version 2.12
+  - Remove special MicroOS firstboot script
+  - Remove locale-check, replaced by another aaa_base implementation
+
 -------------------------------------------------------------------
 Thu Jun 16 17:04:59 UTC 2021 - Ignaz Forster <iforster@suse.com>
 
diff --git a/microos-tools.spec b/microos-tools.spec
index 633aeb9..c5e3af4 100644
--- a/microos-tools.spec
+++ b/microos-tools.spec
@@ -17,7 +17,7 @@
 
 
 Name:           microos-tools
-Version:        2.11
+Version:        2.12
 Release:        0
 Summary:        Files and Scripts for openSUSE MicroOS
 License:        GPL-2.0-or-later
@@ -59,47 +59,50 @@ install -m 0644 %{SOURCE2} %{buildroot}/%{_tmpfilesdir}
 %endif
 
 %pre
-%service_add_pre setup-systemd-proxy-env.service printenv.service
+%service_add_pre setup-systemd-proxy-env.service setup-systemd-proxy-env.path printenv.service
 
 %post
 %{regenerate_initrd_post}
-%service_add_post setup-systemd-proxy-env.service printenv.service
+%service_add_post setup-systemd-proxy-env.service setup-systemd-proxy-env.path printenv.service
 
 %preun
-%service_del_preun setup-systemd-proxy-env.service printenv.service
+%service_del_preun setup-systemd-proxy-env.service setup-systemd-proxy-env.path printenv.service
 
 %postun
 %{regenerate_initrd_post}
-%service_del_postun setup-systemd-proxy-env.service printenv.service
+%service_del_postun setup-systemd-proxy-env.service setup-systemd-proxy-env.path printenv.service
 
 %posttrans
 %{regenerate_initrd_posttrans}
 
+%pre -n microos-devel-tools
+%service_add_pre microos-ro.service
+
+%post -n microos-devel-tools
+%service_add_post microos-ro.service
+
+%preun -n microos-devel-tools
+%service_del_preun microos-ro.service
+
+%postun -n microos-devel-tools
+%service_del_postun microos-ro.service
+
 %files
 %license COPYING
 %dir %{_sysconfdir}/selinux
 %config %{_sysconfdir}/selinux/fixfiles_exclude_dirs
-%dir %{_sysconfdir}/systemd
-%dir %{_sysconfdir}/systemd/system
-%config %{_sysconfdir}/systemd/system/systemd-firstboot.service
-%{_unitdir}/MicroOS-firstboot.service
 %{_unitdir}/printenv.service
 %{_unitdir}/setup-systemd-proxy-env.path
 %{_unitdir}/setup-systemd-proxy-env.service
-%dir %{_unitdir}/sysinit.target.wants
-%{_unitdir}/sysinit.target.wants/MicroOS-firstboot.service
 %dir %{_unitdir}/salt-minion.service.d
 %{_unitdir}/salt-minion.service.d/TMPDIR.conf
 %{_tmpfilesdir}/salt-minion-tmpdir.conf
 %{_sysctldir}/30-corefiles.conf
-%{_libexecdir}/MicroOS-firstboot
 %{_sbindir}/setup-systemd-proxy-env
 %dir %{_prefix}/lib/dracut
 %dir %{_prefix}/lib/dracut/modules.d
 %{_prefix}/lib/dracut/modules.d/98selinux-microos
 %{_systemdgeneratordir}/selinux-autorelabel-generator
-%config %{_sysconfdir}/profile.d/ssh-locale-check.sh
-%{_bindir}/locale-check
 %if 0%{?suse_version} <= 1500
 %{_unitdir}/tmp.mount
 %{_tmpfilesdir}/microos-tmp.conf