From 54e369247d4e466b426d4eb87b19c9637ee36d2f480acd0786b8f4d001a7fdae Mon Sep 17 00:00:00 2001
From: Dario Faggioli <dfaggioli@suse.com>
Date: Tue, 17 May 2022 20:33:52 +0000
Subject: [PATCH] Accepting request 977836 from home:dfaggioli:microos-desktop

- Add a config file, so that we pull a tumbleweed image by default
- Update too latest version, 1.2.15.

OBS-URL: https://build.opensuse.org/request/show/977836
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/distrobox?expand=0&rev=7
---
 distrobox-1.2.14.tar.gz |  3 ---
 distrobox-1.2.15.tar.gz |  3 +++
 distrobox.changes       | 22 ++++++++++++++++++++++
 distrobox.conf          |  3 +++
 distrobox.spec          |  7 ++++++-
 5 files changed, 34 insertions(+), 4 deletions(-)
 delete mode 100644 distrobox-1.2.14.tar.gz
 create mode 100644 distrobox-1.2.15.tar.gz
 create mode 100644 distrobox.conf

diff --git a/distrobox-1.2.14.tar.gz b/distrobox-1.2.14.tar.gz
deleted file mode 100644
index 5873355..0000000
--- a/distrobox-1.2.14.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:86c7a6515d8548e258b4acb152e4a622f671c4ffcf1cc1a36d05b5f56bc6a0aa
-size 65485
diff --git a/distrobox-1.2.15.tar.gz b/distrobox-1.2.15.tar.gz
new file mode 100644
index 0000000..b2a96e7
--- /dev/null
+++ b/distrobox-1.2.15.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:62a7ee779f605347919157fae947331042b771022c7d7d3169a2bd6ecc8589d7
+size 67689
diff --git a/distrobox.changes b/distrobox.changes
index 671da27..eba7f00 100644
--- a/distrobox.changes
+++ b/distrobox.changes
@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Sat May 14 15:29:50 UTC 2022 - Dario Faggioli <dfaggioli@suse.com>
+
+- Add a config file, so that we pull a tumbleweed image by default
+- Update too latest version, 1.2.15. Some changes:
+  * init: Allow all package manager checks to run
+  * init: Fix compatibility with init containers
+  * init: add pacman post-hook to neutralize systemd post-hooks in case we're not in an init-enabled container
+  * init: exclude dbus system socket sharing, it doesn't work and creates confusing error messages
+  * init: fix missing check before umounting on init-enabled containers
+  * init: fix new archlinux mount: /usr/lib/libmount.so.1: version MOUNT_2_38 not found (required by mount) error, upgrade before installing packages
+  * init: fix regression introduced in 3f014de where containers where thinking they were on a booted systemd
+  * init: improve arch linux integration - add pacman pre-post hooks to reduce number of errors occurring
+  * create/enter: print error messages only when not in dry-run
+  * create: add work around for incompatibility between systemd/journald ACLs and overlayfs
+  * enter: check for container errors during first start
+  * enter: do not instantiate a tty if we do not have one
+  * enter: extract container SHELL from inspect, use that as fallback if no custom command provided
+  * enter: fix boolean logic on tty use
+  * enter: fix unbound variable with --dry-run
+  * export: hide unuseful stderr in export
+ 
 -------------------------------------------------------------------
 Tue Mar 29 09:12:32 UTC 2022 - Dario Faggioli <dfaggioli@suse.com>
 
diff --git a/distrobox.conf b/distrobox.conf
new file mode 100644
index 0000000..ccd30af
--- /dev/null
+++ b/distrobox.conf
@@ -0,0 +1,3 @@
+container_image="registry.opensuse.org/opensuse/tumbleweed:latest"
+container_name="tumbleweed"
+container_manager="autodetect"
diff --git a/distrobox.spec b/distrobox.spec
index 06e09c2..7f38e81 100644
--- a/distrobox.spec
+++ b/distrobox.spec
@@ -16,12 +16,13 @@
 #
 
 Name:           distrobox
-Version:        1.2.14
+Version:        1.2.15
 Release:        0
 Summary:        Use any linux distribution inside your terminal
 License:        GPL-3.0
 URL:            https://github.com/89luca89/distrobox
 Source:         distrobox-%{version}.tar.gz
+Source1:        distrobox.conf
 Requires:       %{_bindir}/basename
 Requires:       %{_bindir}/find
 Requires:       %{_bindir}/grep
@@ -43,9 +44,11 @@ external USB devices and graphical apps (X11/Wayland), and audio.
 
 %install
 mkdir -p %{buildroot}%{_bindir}
+mkdir -p %{buildroot}%{_sysconfdir}/distrobox
 mkdir -p %{buildroot}%{_docdir}/%{name}
 ./install --prefix %{buildroot}/%{_prefix}
 install -m 0644 docs/*.md %{buildroot}%{_docdir}/%{name}
+install -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/distrobox/distrobox.conf
 
 %files
 %license COPYING.md
@@ -54,5 +57,7 @@ install -m 0644 docs/*.md %{buildroot}%{_docdir}/%{name}
 %{_bindir}/%{name}-*
 %{_mandir}/man1/%{name}.1.gz
 %{_mandir}/man1/%{name}-*.1.gz
+%config %{_sysconfdir}/distrobox
+%config %{_sysconfdir}/distrobox/distrobox.conf
 
 %changelog