Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package dbus-1 for openSUSE:Factory checked
in at 2021-11-27 00:50:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dbus-1 (Old)
and /work/SRC/openSUSE:Factory/.dbus-1.new.1895 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dbus-1"
Sat Nov 27 00:50:36 2021 rev:167 rq:933402 version:1.12.20
Changes:
--------
--- /work/SRC/openSUSE:Factory/dbus-1/dbus-1-x11.changes 2020-08-19
18:45:13.095477127 +0200
+++ /work/SRC/openSUSE:Factory/.dbus-1.new.1895/dbus-1-x11.changes
2021-11-27 00:51:18.086806816 +0100
@@ -1,0 +2,16 @@
+Thu Sep 23 15:42:27 UTC 2021 - Stefan Schubert <sch...@suse.de>
+
+- Added BuildRequires alts for libalternatives.
+
+-------------------------------------------------------------------
+Thu Sep 16 12:52:55 UTC 2021 - Stefan Schubert <sch...@suse.de>
+
+- Fixed spec file regarding removing old update-alternatives
+ entries.
+
+-------------------------------------------------------------------
+Wed Aug 4 10:04:12 UTC 2021 - Stefan Schubert <sch...@suse.de>
+
+- Use libalternatives instead of update-alternatives.
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/dbus-1/dbus-1.changes 2021-04-12
12:33:42.505048822 +0200
+++ /work/SRC/openSUSE:Factory/.dbus-1.new.1895/dbus-1.changes 2021-11-27
00:51:18.350805904 +0100
@@ -1,0 +2,21 @@
+Mon Nov 8 16:42:10 UTC 2021 - Callum Farmer <gm...@opensuse.org>
+
+- Add CONFIG parameter to %sysusers_generate_pre
+
+-------------------------------------------------------------------
+Thu Sep 23 15:41:27 UTC 2021 - Stefan Schubert <sch...@suse.de>
+
+- Added BuildRequires alts for libalternatives.
+
+-------------------------------------------------------------------
+Thu Sep 16 12:51:27 UTC 2021 - Stefan Schubert <sch...@suse.de>
+
+- Fixed spec file regarding removing old update-alternatives
+ entries.
+
+-------------------------------------------------------------------
+Wed Aug 4 10:03:46 UTC 2021 - Stefan Schubert <sch...@suse.de>
+
+- Use libalternatives instead of update-alternatives.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dbus-1-x11.spec ++++++
--- /var/tmp/diff_new_pack.TPDgMI/_old 2021-11-27 00:51:19.186803018 +0100
+++ /var/tmp/diff_new_pack.TPDgMI/_new 2021-11-27 00:51:19.186803018 +0100
@@ -16,6 +16,12 @@
#
+%if 0%{?suse_version} > 1500
+%bcond_without libalternatives
+%else
+%bcond_with libalternatives
+%endif
+
%define _name dbus
%define _libname libdbus-1-3
%if 0%{?suse_version} <= 1320
@@ -45,8 +51,13 @@
BuildRequires: pkgconfig
BuildRequires: pkgconfig(libsystemd) >= 209
BuildRequires: pkgconfig(x11)
+%if %{with libalternatives}
+Requires: alts
+BuildRequires: alts
+%else
Requires(post): update-alternatives
Requires(preun):update-alternatives
+%endif
Supplements: (dbus-1 and libX11-6)
Provides: dbus-launch
%if %{with selinux}
@@ -94,8 +105,27 @@
make DESTDIR=$tdir install
mkdir -p %{buildroot}/%{_bindir}
mv $tdir/%{_bindir}/dbus-launch %{buildroot}/%{_bindir}/dbus-launch.x11
+%if ! %{with libalternatives}
+# create symlinks for update-alternatives
mkdir -p %{buildroot}%{_sysconfdir}/alternatives
ln -s -f %{_sysconfdir}/alternatives/dbus-launch
%{buildroot}%{_bindir}/dbus-launch
+%else
+# create entries for libalternatives
+ln -sf %{_bindir}/alts %{buildroot}%{_bindir}/dbus-launch
+mkdir -p %{buildroot}%{_datadir}/libalternatives/dbus-launch
+cat > %{buildroot}%{_datadir}/libalternatives/dbus-launch/20.conf <<EOF
+binary=%{_bindir}/dbus-launch.x11
+group=dbus-launch
+EOF
+%endif
+
+%if %{with libalternatives}
+%pre
+# removing old update-alternatives entries
+if [ "$1" -gt 0 ] && [ -f %{_sbindir}/update-alternatives ] ; then
+ %{_sbindir}/update-alternatives --remove dbus-launch
%{_bindir}/dbus-launch.x11
+fi
+%else
%post
%{_sbindir}/update-alternatives --install %{_bindir}/dbus-launch dbus-launch
%{_bindir}/dbus-launch.x11 20
@@ -104,9 +134,16 @@
if [ "$1" = 0 ] ; then
%{_sbindir}/update-alternatives --remove dbus-launch
%{_bindir}/dbus-launch.x11
fi
+%endif
%files
+%if ! %{with libalternatives}
%ghost %{_sysconfdir}/alternatives/dbus-launch
+%else
+%dir %{_datadir}/libalternatives
+%dir %{_datadir}/libalternatives/dbus-launch
+%{_datadir}/libalternatives/dbus-launch/20.conf
+%endif
%{_bindir}/dbus-launch
%{_bindir}/dbus-launch.x11
++++++ dbus-1.spec ++++++
--- /var/tmp/diff_new_pack.TPDgMI/_old 2021-11-27 00:51:19.214802921 +0100
+++ /var/tmp/diff_new_pack.TPDgMI/_new 2021-11-27 00:51:19.214802921 +0100
@@ -16,6 +16,12 @@
#
+%if 0%{?suse_version} > 1500
+%bcond_without libalternatives
+%else
+%bcond_with libalternatives
+%endif
+
%define with_systemd 1
%define _name dbus
%define _libname libdbus-1-3
@@ -43,15 +49,19 @@
BuildRequires: libexpat-devel >= 2.1.0
BuildRequires: permissions
BuildRequires: pkgconfig
-BuildRequires: sysuser-shadow
BuildRequires: sysuser-tools
BuildRequires: xmlto
BuildRequires: pkgconfig(libsystemd) >= 209
Requires(post): %{_libname} = %{version}
-Requires(post): update-alternatives
Requires(post): diffutils
Requires(pre): permissions
+%if %{with libalternatives}
+Requires: alts
+BuildRequires: alts
+%else
+Requires(post): update-alternatives
Requires(preun):update-alternatives
+%endif
Provides: dbus-launch
%sysusers_requires
%if %{with selinux}
@@ -124,7 +134,7 @@
# The original dbus sysusers config does not create our account,
# overwrite it with our user definition
cp %{SOURCE5} bus/sysusers.d/dbus.conf
-%sysusers_generate_pre %{SOURCE5} messagebus
+%sysusers_generate_pre %{SOURCE5} messagebus dbus.conf
%check
%make_build check
@@ -161,8 +171,19 @@
ln -sf /%{_bindir}/dbus-uuidgen %{buildroot}/bin/dbus-uuidgen
%endif
+%if ! %{with libalternatives}
+# create symlinks for update-alternatives
mkdir -p %{buildroot}%{_sysconfdir}/alternatives
ln -s -f %{_sysconfdir}/alternatives/dbus-launch
%{buildroot}%{_bindir}/dbus-launch
+%else
+# create entries for libalternatives
+ln -sf %{_bindir}/alts %{buildroot}%{_bindir}/dbus-launch
+mkdir -p %{buildroot}%{_datadir}/libalternatives/dbus-launch
+cat > %{buildroot}%{_datadir}/libalternatives/dbus-launch/10.conf <<EOF
+binary=%{_bindir}/dbus-launch.nox11
+group=dbus-launch
+EOF
+%endif
find %{buildroot} -type f -name "*.la" -delete -print
@@ -176,6 +197,12 @@
%pre -f messagebus.pre
%service_add_pre dbus.service dbus.socket
+%if %{with libalternatives}
+# removing old update-alternatives entries
+if [ "$1" -gt 0 ] && [ -f %{_sbindir}/update-alternatives ] ; then
+ %{_sbindir}/update-alternatives --remove dbus-launch
%{_bindir}/dbus-launch.nox11
+fi
+%endif
%post
if [ -e %{_localstatedir}/lib/dbus/machine-id -a -e %{_sysconfdir}/machine-id
]; then
@@ -191,14 +218,18 @@
/sbin/ldconfig
%set_permissions %{_libexecdir}/dbus-1/dbus-daemon-launch-helper
+%if ! %{with libalternatives}
%{_sbindir}/update-alternatives --install %{_bindir}/dbus-launch dbus-launch
%{_bindir}/dbus-launch.nox11 10
+%endif
%service_add_post dbus.service dbus.socket
%tmpfiles_create %{_prefix}/lib/tmpfiles.d/dbus.conf
%preun
+%if ! %{with libalternatives}
if [ "$1" = 0 ] ; then
%{_sbindir}/update-alternatives --remove dbus-launch
%{_bindir}/dbus-launch.nox11
fi
+%endif
%service_del_preun dbus.service dbus.socket
%postun
@@ -259,7 +290,13 @@
%{_userunitdir}/dbus.socket
%dir %{_userunitdir}/sockets.target.wants
%{_userunitdir}/sockets.target.wants/dbus.socket
+%if ! %{with libalternatives}
%ghost %{_sysconfdir}/alternatives/dbus-launch
+%else
+%dir %{_datadir}/libalternatives
+%dir %{_datadir}/libalternatives/dbus-launch
+%{_datadir}/libalternatives/dbus-launch/10.conf
+%endif
%{_bindir}/dbus-launch.nox11
%{_bindir}/dbus-launch
