Fridrich Strba 2016-11-24 11:18:50 +00:00 committed by Git OBS Bridge
parent 4ecc5abf1e
commit 565202680f
2 changed files with 19 additions and 12 deletions

View File

@ -25,6 +25,8 @@ Summary: D-Bus Message Bus System
License: GPL-2.0+ or AFL-2.1
Group: System/Daemons
Url: http://dbus.freedesktop.org/
Requires(post): update-alternatives
Requires(preun): update-alternatives
# COMMON1-BEGIN
# COMMON1-BEGIN
Version: 1.10.12
@ -54,8 +56,6 @@ BuildRequires: pkgconfig
BuildRequires: update-desktop-files
BuildRequires: xmlto
BuildRequires: pkgconfig(x11)
Requires(post): update-alternatives
Requires(preun): update-alternatives
%description
D-Bus contains some tools that require Xlib to be installed, those are
@ -190,6 +190,14 @@ ln -s -f %{_sysconfdir}/alternatives/dbus-launch %{buildroot}%{_bindir}/dbus-lau
%verifyscript -n dbus-1
%verify_permissions -e /lib/dbus-1/dbus-daemon-launch-helper
%post -n dbus-1-x11
%{_sbindir}/update-alternatives --install %{_bindir}/dbus-launch dbus-launch %{_bindir}/dbus-launch.x11 20
%preun -n dbus-1-x11
if [ "$1" = 0 ] ; then
%{_sbindir}/update-alternatives --remove dbus-launch %{_bindir}/dbus-launch.x11
fi
%pre -n dbus-1
%{_sbindir}/groupadd -r messagebus 2> /dev/null || :
%if 0%{?suse_version} <= 1315 && !0%{?is_opensuse}
@ -216,19 +224,11 @@ fi
/sbin/ldconfig
%set_permissions /lib/dbus-1/dbus-daemon-launch-helper
%post
%{_sbindir}/update-alternatives --install %{_bindir}/dbus-launch dbus-launch %{_bindir}/dbus-launch.x11 20
%preun
if [ "$1" = 0 ] ; then
%{_sbindir}/update-alternatives --remove dbus-launch %{_bindir}/dbus-launch.x11
fi
%files
%defattr(-,root,root)
%ghost %{_sysconfdir}/alternatives/dbus-launch
%{_bindir}/dbus-launch.x11
%{_bindir}/dbus-launch
%{_bindir}/dbus-launch.x11
%{_mandir}/man1/dbus-launch.1*
%files -n dbus-1

View File

@ -113,6 +113,9 @@ touch %{buildroot}/%{_localstatedir}/lib/dbus/machine-id
mkdir -p %{buildroot}%{_prefix}/bin
ln -sf /bin/dbus-send %{buildroot}%{_bindir}/dbus-send
mkdir -p %{buildroot}%{_sysconfdir}/alternatives
ln -s -f %{_sysconfdir}/alternatives/dbus-launch %{buildroot}%{_bindir}/dbus-launch
%verifyscript -n dbus-1
%verify_permissions -e /lib/dbus-1/dbus-daemon-launch-helper
@ -120,7 +123,9 @@ ln -sf /bin/dbus-send %{buildroot}%{_bindir}/dbus-send
%{_sbindir}/update-alternatives --install %{_bindir}/dbus-launch dbus-launch %{_bindir}/dbus-launch.x11 20
%preun -n dbus-1-x11
%{_sbindir}/update-alternatives --remove dbus-launch %{_bindir}/dbus-launch.x11
if [ "$1" = 0 ] ; then
%{_sbindir}/update-alternatives --remove dbus-launch %{_bindir}/dbus-launch.x11
fi
%pre -n dbus-1
%{_sbindir}/groupadd -r messagebus 2> /dev/null || :
@ -150,6 +155,8 @@ fi
%files
%defattr(-,root,root)
%ghost %{_sysconfdir}/alternatives/dbus-launch
%{_bindir}/dbus-launch
%{_bindir}/dbus-launch.x11
%{_mandir}/man1/dbus-launch.1*