Accepting request 962625 from home:Vogtinator:branches:Base:System
- Use --with-x=auto to actually enable X11 integration (boo#1197258, workaround https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/263) - Drop use of %{with libalternatives}, there's no such bcond defined and in many other places it's not optional anyway (boo#1197258) OBS-URL: https://build.opensuse.org/request/show/962625 OBS-URL: https://build.opensuse.org/package/show/Base:System/dbus-1?expand=0&rev=316
This commit is contained in:
parent
e47922d8b1
commit
8b9e5e4ae2
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 18 09:41:28 UTC 2022 - Fabian Vogt <fvogt@suse.com>
|
||||
|
||||
- Use --with-x=auto to actually enable X11 integration (boo#1197258,
|
||||
workaround https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/263)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 4 19:36:07 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
|
@ -73,6 +73,8 @@ export CFLAGS="%{optflags} -fno-strict-aliasing -fPIC -fpie"
|
||||
export LDFLAGS="-pie"
|
||||
export CXXFLAGS="%{optflags} -fno-strict-aliasing"
|
||||
export V=1
|
||||
# --with-x=auto is a workaround until https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/263
|
||||
# is included (1.14.1+)
|
||||
%configure \
|
||||
--disable-static \
|
||||
--runstatedir=%{_rundir} \
|
||||
@ -90,7 +92,7 @@ export V=1
|
||||
--with-system-socket=/run/dbus/system_bus_socket \
|
||||
--with-systemdsystemunitdir=%{_unitdir} \
|
||||
--with-systemduserunitdir=%{_userunitdir} \
|
||||
--with-x
|
||||
--with-x=auto
|
||||
%make_build
|
||||
|
||||
%install
|
||||
|
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 17 21:00:39 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
- Drop use of %{with libalternatives}, there's no such bcond defined
|
||||
and in many other places it's not optional anyway (boo#1197258)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 14 10:46:30 UTC 2022 - Dirk Müller <dmueller@suse.com>
|
||||
|
||||
|
10
dbus-1.spec
10
dbus-1.spec
@ -168,12 +168,10 @@ rm -Rf %{buildroot}%{_datadir}/doc/dbus
|
||||
|
||||
%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
|
||||
@ -189,18 +187,10 @@ fi
|
||||
|
||||
/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
|
||||
|
Loading…
Reference in New Issue
Block a user