From b78f7c34c3079a518181545d6691ac8809a8030d58acf6e7fee8eed616830122 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 23 Jan 2023 08:00:28 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/microos-tools revision 23 OBS-URL: https://build.opensuse.org/package/show/devel:microos/microos-tools?expand=0&rev=599fa587d46af9f1f48453e47aa74aa0 --- microos-tools-2.17.tar.xz | 3 +++ microos-tools-2.18.tar.xz | 3 --- microos-tools.changes | 8 -------- microos-tools.spec | 11 ++--------- 4 files changed, 5 insertions(+), 20 deletions(-) create mode 100644 microos-tools-2.17.tar.xz delete mode 100644 microos-tools-2.18.tar.xz diff --git a/microos-tools-2.17.tar.xz b/microos-tools-2.17.tar.xz new file mode 100644 index 0000000..dc879d3 --- /dev/null +++ b/microos-tools-2.17.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eed89447f0f6cb4897fc8b2ebd07858a3f2533e0ca46cb8658fd5f4bb9981043 +size 76688 diff --git a/microos-tools-2.18.tar.xz b/microos-tools-2.18.tar.xz deleted file mode 100644 index d80ffb7..0000000 --- a/microos-tools-2.18.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:639f9f332f765ea89706c34100c845a20ca42de0cbc367b790fefa4d1fc8c1db -size 80904 diff --git a/microos-tools.changes b/microos-tools.changes index 22ddead..949ee09 100644 --- a/microos-tools.changes +++ b/microos-tools.changes @@ -1,11 +1,3 @@ -------------------------------------------------------------------- -Thu Jan 19 10:49:29 UTC 2023 - Ignaz Forster - -- Update to version 2.18: - - Add TMPDIR to tukit binddirs for Salt - - 98selinux-microos: Add chroot as dependency - - Fix spelling error in warning - ------------------------------------------------------------------- Fri Sep 16 14:12:04 UTC 2022 - Thorsten Kukuk diff --git a/microos-tools.spec b/microos-tools.spec index 25c045c..08681e6 100644 --- a/microos-tools.spec +++ b/microos-tools.spec @@ -1,7 +1,7 @@ # # spec file for package microos-tools # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,10 +16,8 @@ # -%{!?_distconfdir: %global _distconfdir %{_prefix}%{_sysconfdir}} - Name: microos-tools -Version: 2.18 +Version: 2.17 Release: 0 Summary: Files and Scripts for openSUSE MicroOS License: GPL-2.0-or-later @@ -99,11 +97,6 @@ install -m 0644 %{SOURCE2} %{buildroot}/%{_tmpfilesdir} %dir %{_unitdir}/salt-minion.service.d %{_unitdir}/salt-minion.service.d/TMPDIR.conf %{_tmpfilesdir}/salt-minion-tmpdir.conf -%if %{?suse_version} <= 1500 -%dir %{_distconfdir} -%endif -%dir %{_distconfdir}/tukit.conf.d -%{_distconfdir}/tukit.conf.d/salt-tukit.conf %{_sysctldir}/30-corefiles.conf %{_sbindir}/setup-systemd-proxy-env %dir %{_prefix}/lib/dracut From 28cd70b843af52399af1db7f0f018c4fc388fb8c890e5571768c645b0ea56a43 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Mon, 23 Jan 2023 08:05:38 +0000 Subject: [PATCH 2/2] Rebase after oS:F revert OBS-URL: https://build.opensuse.org/package/show/devel:microos/microos-tools?expand=0&rev=11 --- microos-tools-2.17.tar.xz | 3 --- microos-tools-2.18.tar.xz | 3 +++ microos-tools.changes | 8 ++++++++ microos-tools.spec | 11 +++++++++-- 4 files changed, 20 insertions(+), 5 deletions(-) delete mode 100644 microos-tools-2.17.tar.xz create mode 100644 microos-tools-2.18.tar.xz diff --git a/microos-tools-2.17.tar.xz b/microos-tools-2.17.tar.xz deleted file mode 100644 index dc879d3..0000000 --- a/microos-tools-2.17.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eed89447f0f6cb4897fc8b2ebd07858a3f2533e0ca46cb8658fd5f4bb9981043 -size 76688 diff --git a/microos-tools-2.18.tar.xz b/microos-tools-2.18.tar.xz new file mode 100644 index 0000000..d80ffb7 --- /dev/null +++ b/microos-tools-2.18.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:639f9f332f765ea89706c34100c845a20ca42de0cbc367b790fefa4d1fc8c1db +size 80904 diff --git a/microos-tools.changes b/microos-tools.changes index 949ee09..22ddead 100644 --- a/microos-tools.changes +++ b/microos-tools.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Jan 19 10:49:29 UTC 2023 - Ignaz Forster + +- Update to version 2.18: + - Add TMPDIR to tukit binddirs for Salt + - 98selinux-microos: Add chroot as dependency + - Fix spelling error in warning + ------------------------------------------------------------------- Fri Sep 16 14:12:04 UTC 2022 - Thorsten Kukuk diff --git a/microos-tools.spec b/microos-tools.spec index 08681e6..25c045c 100644 --- a/microos-tools.spec +++ b/microos-tools.spec @@ -1,7 +1,7 @@ # # spec file for package microos-tools # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,8 +16,10 @@ # +%{!?_distconfdir: %global _distconfdir %{_prefix}%{_sysconfdir}} + Name: microos-tools -Version: 2.17 +Version: 2.18 Release: 0 Summary: Files and Scripts for openSUSE MicroOS License: GPL-2.0-or-later @@ -97,6 +99,11 @@ install -m 0644 %{SOURCE2} %{buildroot}/%{_tmpfilesdir} %dir %{_unitdir}/salt-minion.service.d %{_unitdir}/salt-minion.service.d/TMPDIR.conf %{_tmpfilesdir}/salt-minion-tmpdir.conf +%if %{?suse_version} <= 1500 +%dir %{_distconfdir} +%endif +%dir %{_distconfdir}/tukit.conf.d +%{_distconfdir}/tukit.conf.d/salt-tukit.conf %{_sysctldir}/30-corefiles.conf %{_sbindir}/setup-systemd-proxy-env %dir %{_prefix}/lib/dracut