Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libcontainers-common for
openSUSE:Factory checked in at 2023-05-17 10:52:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libcontainers-common (Old)
and /work/SRC/openSUSE:Factory/.libcontainers-common.new.1533 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libcontainers-common"
Wed May 17 10:52:46 2023 rev:60 rq:1087430 version:20230214
Changes:
--------
---
/work/SRC/openSUSE:Factory/libcontainers-common/libcontainers-common.changes
2023-04-29 17:27:53.938481476 +0200
+++
/work/SRC/openSUSE:Factory/.libcontainers-common.new.1533/libcontainers-common.changes
2023-05-17 10:52:52.211263079 +0200
@@ -1,0 +2,8 @@
+Tue May 16 12:51:34 UTC 2023 - Danish Prakash <[email protected]>
+
+- Introduce new subpackage that adds SLE-specific mounts only
+ on SLE systems (if sles-release) hence avoiding superfluous
+ warnings on non-SLE systems while running podman commands.
+ (bsc#1211124)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libcontainers-common.spec ++++++
--- /var/tmp/diff_new_pack.q07tE4/_old 2023-05-17 10:52:52.783266159 +0200
+++ /var/tmp/diff_new_pack.q07tE4/_new 2023-05-17 10:52:52.787266181 +0200
@@ -54,6 +54,8 @@
BuildRequires: go-go-md2man
Requires(post): %{_bindir}/grep
Requires(post): %{_bindir}/sed
+# add SLE-specific mounts for only SLES systems
+Requires: (libcontainers-sles-mounts if sles-release)
Provides: libcontainers-image = %{version}
Provides: libcontainers-storage = %{version}
Obsoletes: libcontainers-image < %{version}
@@ -64,6 +66,12 @@
Configuration files and manpages shared by tools that are based on the
github.com/containers libraries, such as Buildah, CRI-O, Podman and Skopeo.
+%package -n libcontainers-sles-mounts
+Summary: Default mounts for SLE distributions
+
+%description -n libcontainers-sles-mounts
+Updates /etc/containers/mounts.conf with default mounts for SLE distributions
+
%prep
%setup -q -Tcq -b0 -b1 -b8
# copy the LICENSE file in the build root
@@ -95,14 +103,12 @@
go-md2man -in pkg/hooks/docs/oci-hooks.5.md -out pkg/hooks/docs/oci-hooks.5
cd ..
-%if 0%{?is_opensuse}
-# no default mounts
-%else
+# These would only be used on SLE-systems
+# via libcontainers-sles-mounts subpackage
cat >>%{SOURCE5} <<EOL
%{_sysconfdir}/SUSEConnect:%{_sysconfdir}/SUSEConnect
%{_sysconfdir}/zypp/credentials.d/SCCcredentials:%{_sysconfdir}/zypp/credentials.d/SCCcredentials
EOL
-%endif
cd common-%{commonver}
%make_build docs
@@ -158,8 +164,6 @@
%config(noreplace) %{_sysconfdir}/containers/policy.json
%config(noreplace) %{_sysconfdir}/containers/storage.conf
-%config(noreplace) %{_sysconfdir}/containers/mounts.conf
-%{_datadir}/containers/mounts.conf
%config(noreplace) %{_sysconfdir}/containers/registries.conf
%config(noreplace) %{_sysconfdir}/containers/seccomp.json
%config(noreplace) %{_sysconfdir}/containers/registries.d/default.yaml
@@ -171,4 +175,8 @@
%{_mandir}/man5/*.5%{?ext_man}
%license LICENSE
+%files -n libcontainers-sles-mounts
+%config(noreplace) %{_sysconfdir}/containers/mounts.conf
+%{_datadir}/containers/mounts.conf
+
%changelog
