Summary: D-BUS message bus
Summary(pl.UTF-8): Magistrala przesyłania komunikatów D-BUS
Name: dbus
-Version: 1.4.8
-Release: 1
+Version: 1.4.16
+Release: 5
License: AFL v2.1 or GPL v2
Group: Libraries
Source0: http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz
-# Source0-md5: e30253e15f0f4e6c5ee9e6f0eba5046c
+# Source0-md5: 44a2a10678e7e50460879c3eb4453a65
Source1: messagebus.init
Source2: %{name}-daemon-1-profile.d-sh
Source3: %{name}-sysconfig
Source4: %{name}-xinitrc.sh
Source5: messagebus.upstart
+Source6: %{name}.tmpfiles
Patch0: %{name}-nolibs.patch
Patch1: %{name}-config.patch
Patch2: %{name}-no_fatal_checks.patch
BuildRequires: libcap-ng-devel
%{?with_selinux:BuildRequires: libselinux-devel}
BuildRequires: libtool >= 2:2.0
+BuildRequires: libxslt-progs
BuildRequires: pkgconfig
-BuildRequires: rpmbuild(macros) >= 1.561
+BuildRequires: rpmbuild(macros) >= 1.626
BuildRequires: sed >= 4.0
BuildRequires: xmlto
%{?with_X11:BuildRequires: xorg-lib-libX11-devel}
Requires: %{name}-dirs = %{version}-%{release}
Requires: %{name}-libs = %{version}-%{release}
Requires: expat >= %{expat_version}
-Requires: rc-scripts >= 0.4.1.26
+Requires: rc-scripts >= 0.4.3.0
+Requires: systemd-units >= 37-0.10
Provides: group(messagebus)
Provides: user(messagebus)
-Obsoletes: dbus-X11
Obsoletes: dbus-glib-tools
Conflicts: pam < 0.99.7.1
# not available for dbus 0.9x yet(?)
%description static -l pl.UTF-8
Statyczna biblioteka D-BUS.
+%package x11
+Summary: X11 session support for D-BUS
+Summary(pl.UTF-8): Obsługa sesji X11 dla D-BUS
+Group: X11/Applications
+Requires: %{name} = %{version}-%{release}
+Obsoletes: dbus-X11
+
+%description x11
+This package contains D-BUS utilities to start D-BUS service together
+with user X11 session.
+
+%description x11 -l pl.UTF-8
+Ten pakiet zawiera narzędzia D-BUS pozwalające na uruchomienie usługi
+D-BUS wraz z sesją X11 użytkownika.
+
%prep
%setup -q
%patch0 -p1
%{__automake}
%configure \
%{?debug:--enable-verbose-mode} \
- --disable-silent-rules \
--disable-asserts \
+ --disable-silent-rules \
--disable-tests \
--enable-abstract-sockets=auto \
%{?with_selinux:--enable-selinux} \
--with-session-socket-dir=/tmp \
--with-system-pid-file=%{_localstatedir}/run/dbus.pid \
--with-xml=expat \
+ --with-systemdsystemunitdir=%{systemdunitdir} \
%{!?with_X11:--without-x}
%{__make}
install -d $RPM_BUILD_ROOT/etc/{init,profile.d,rc.d/init.d,sysconfig,X11/xinit/xinitrc.d} \
$RPM_BUILD_ROOT%{_datadir}/dbus-1/{services,interfaces} \
$RPM_BUILD_ROOT%{_localstatedir}/run/dbus \
- $RPM_BUILD_ROOT/%{_lib}
+ $RPM_BUILD_ROOT/%{_lib} \
+ $RPM_BUILD_ROOT/usr/lib/tmpfiles.d
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/messagebus
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/profile.d/dbus-daemon-1.sh
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/messagebus
-install %{SOURCE4} $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d
-install %{SOURCE5} $RPM_BUILD_ROOT/etc/init/messagebus.conf
+install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/messagebus
+install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/profile.d/dbus-daemon-1.sh
+cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/messagebus
+install -p %{SOURCE4} $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d
+cp -p %{SOURCE5} $RPM_BUILD_ROOT/etc/init/messagebus.conf
+
+install %{SOURCE6} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
# upstart (/sbin/init) requires libdbus so it must be in /lib(64)
mv -f $RPM_BUILD_ROOT%{_libdir}/libdbus-1.so.* $RPM_BUILD_ROOT/%{_lib}
ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libdbus-1.so.*.*.*) \
$RPM_BUILD_ROOT%{_libdir}/libdbus-1.so
-%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/dbus/api
+ln -s dbus.service $RPM_BUILD_ROOT%{systemdunitdir}/messagebus.service
+
+%{__rm} -rf $RPM_BUILD_ROOT%{_docdir}/dbus/api
%clean
rm -rf $RPM_BUILD_ROOT
%post
/sbin/chkconfig --add messagebus
%service messagebus restart "D-Bus daemon"
+export NORESTART="yes"
+%systemd_post messagebus.service
%preun
if [ "$1" = "0" ];then
%userremove messagebus
%groupremove messagebus
fi
+%systemd_reload
+
+%triggerpostun -- dbus < 1.4.16-5
+%systemd_trigger messagebus.service
+if [ -f /etc/sysconfig/dbus ]; then
+ mv -f /etc/sysconfig/messagebus{,.rpmnew}
+ mv -f /etc/sysconfig/{dbus,messagebus}
+elif [ -f /etc/sysconfig/dbus.rpmsave ]; then
+ mv -f /etc/sysconfig/messagebus{,.rpmnew}
+ mv -f /etc/sysconfig/{dbus.rpmsave,messagebus}
+fi
%if 0
%post upstart
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
-%triggerpostun -- %{name} < 0.92
-%banner %{name} << EOF
-WARNING!!!
-configuration file /etc/sysconfig/dbus has been moved to /etc/sysconfig/messagebus!
-EOF
-
-if [ -f /etc/sysconfig/dbus ]; then
- mv -f /etc/sysconfig/messagebus{,.rpmnew}
- mv -f /etc/sysconfig/{dbus,messagebus}
-elif [ -f /etc/sysconfig/dbus.rpmsave ]; then
- mv -f /etc/sysconfig/messagebus{,.rpmnew}
- mv -f /etc/sysconfig/{dbus.rpmsave,messagebus}
-fi
-
%files
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/dbus-cleanup-sockets
%attr(755,root,root) %{_bindir}/dbus-daemon
%attr(755,root,root) %{_bindir}/dbus-uuidgen
-# R: libX11
-%attr(755,root,root) %{_bindir}/dbus-launch
%attr(755,root,root) %{_bindir}/dbus-monitor
%attr(755,root,root) %{_bindir}/dbus-send
%attr(4754,root,messagebus) %{_libdir}/dbus-daemon-launch-helper
-%dir %{_libdir}/dbus-1
%dir %{_datadir}/dbus-1
%dir %{_datadir}/dbus-1/interfaces
%dir %{_datadir}/dbus-1/services
%dir %{_datadir}/dbus-1/system-services
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dbus-1/*.conf
+%config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/*.conf
%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/messagebus
%attr(754,root,root) /etc/rc.d/init.d/*
%attr(755,root,root) /etc/profile.d/dbus-daemon-1.sh
-%attr(755,root,root) /etc/X11/xinit/xinitrc.d/*.sh
+/usr/lib/tmpfiles.d/%{name}.conf
%dir %{_localstatedir}/run/dbus
%dir /var/lib/dbus
%{_mandir}/man1/dbus-cleanup-sockets.1*
%{_mandir}/man1/dbus-daemon.1*
%{_mandir}/man1/dbus-uuidgen.1*
-%{_mandir}/man1/dbus-launch.1*
%{_mandir}/man1/dbus-monitor.1*
%{_mandir}/man1/dbus-send.1*
+%{systemdunitdir}/dbus.service
+%{systemdunitdir}/dbus.socket
+%{systemdunitdir}/dbus.target.wants/dbus.socket
+%{systemdunitdir}/messagebus.service
+%{systemdunitdir}/multi-user.target.wants/dbus.service
+%{systemdunitdir}/sockets.target.wants/dbus.socket
+
%if "%{pld_release}" != "ti"
%files upstart
%defattr(644,root,root,755)
%files dirs
%defattr(644,root,root,755)
-%dir %{_sysconfdir}/dbus-1
-%dir %{_sysconfdir}/dbus-1/system.d
-%dir %{_sysconfdir}/dbus-1/session.d
+%dir /etc/dbus-1
+%dir /etc/dbus-1/system.d
+%dir /etc/dbus-1/session.d
%files libs
%defattr(644,root,root,755)
%{_libdir}/libdbus-1.la
%dir %{_libdir}/dbus-1.0
%{_libdir}/dbus-1.0/include
-%{_pkgconfigdir}/dbus-1.pc
%{_includedir}/dbus-1.0
+%{_pkgconfigdir}/dbus-1.pc
%files static
%defattr(644,root,root,755)
%{_libdir}/libdbus-1.a
+
+%files x11
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/dbus-launch
+%{_mandir}/man1/dbus-launch.1*
+%attr(755,root,root) /etc/X11/xinit/xinitrc.d/dbus-xinitrc.sh
projects / packages / dbus.git / blobdiff