-%define gettext_package dbus
-%define expat_version 1.95.5
-%define glib2_version 2.2.0
-%define qt_version 3.1.0
+#
+# Conditional build:
+%bcond_without selinux # build without SELinux support
+%define expat_version 1:1.95.5
Summary: D-BUS message bus
+Summary(pl.UTF-8): Magistrala przesyłania komunikatów D-BUS
Name: dbus
-Version: 0.11
-Release: 1
-Source0: http://www.freedesktop.org/software/dbus/releases/%{name}-%{version}.tar.gz
-# Source0-md5: 87f8cf7ffd114846d577e454ef3129aa
-Patch0: %{name}-ac.patch
-URL: http://www.freedesktop.org/software/dbus/
-License: AFL/GPL
+Version: 1.2.22
+Release: 2
+License: AFL v2.1 or GPL v2
Group: Libraries
-BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-PreReq: chkconfig
+Source0: http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz
+# Source0-md5: 54c5f3c79a1f852d2256aca07163813c
+Source1: messagebus.init
+Source2: %{name}-daemon-1-profile.d-sh
+Source3: %{name}-sysconfig
+Source4: %{name}-xinitrc.sh
+Patch0: %{name}-nolibs.patch
+Patch1: %{name}-config.patch
+Patch2: %{name}-no_fatal_checks.patch
+Patch3: %{name}-allow-introspection.patch
+URL: http://www.freedesktop.org/Software/dbus
+BuildRequires: audit-libs-devel
+BuildRequires: autoconf >= 2.52
+BuildRequires: automake >= 1:1.9
+BuildRequires: doxygen
BuildRequires: expat-devel >= %{expat_version}
-BuildRequires: glib2-devel >= %{glib2_version}
-BuildRequires: qt-devel >= %{qt_version}
-BuildRequires: kdelibs-devel
+BuildRequires: libcap-ng-devel
+%{?with_selinux:BuildRequires: libselinux-devel}
+BuildRequires: libtool
+BuildRequires: pkgconfig
+BuildRequires: rpmbuild(macros) >= 1.268
+BuildRequires: sed >= 4.0
+BuildRequires: xmlto
+BuildRequires: xorg-lib-libX11-devel
+Requires(post,postun): /sbin/ldconfig
+Requires(post,preun): /sbin/chkconfig
+Requires(postun): /usr/sbin/groupdel
+Requires(postun): /usr/sbin/userdel
+Requires(pre): /bin/id
+Requires(pre): /usr/bin/getgid
+Requires(pre): /usr/sbin/groupadd
+Requires(pre): /usr/sbin/useradd
+Requires: %{name}-dirs = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
+Requires: expat >= %{expat_version}
+Requires: rc-scripts >= 0.4.1.26
+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(?)
+#Obsoletes: dbus-gtk dbus-gcj dbus-gcj-devel dbus-gcj-static
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
D-BUS is a system for sending messages between applications. It is
used both for the systemwide message bus service, and as a
per-user-login-session messaging facility.
-%package devel
-Summary: Libraries and headers for D-BUS
-Group: Development/Libraries
-Requires: %{name} = %{version}
+%description -l pl.UTF-8
+D-BUS to system przesyłania komunikatów pomiędzy aplikacjami. Jest
+używany zarówno jako ogólnosystemowa usługa magistrali komunikatów jak
+i możliwość przesyłania komunikatów w ramach jednej sesji użytkownika.
-%description devel
-Headers and static libraries for D-BUS.
+%package dirs
+Summary: D-BUS directories
+Summary(pl.UTF-8): Katalogi D-BUS
+Group: Libraries
+
+%description dirs
+D-BUS directories.
-%package glib
-Summary: GLib-based library for using D-BUS
+%description dirs -l pl.UTF-8
+Katalogi D-BUS.
+
+%package libs
+Summary: D-BUS library
+Summary(pl.UTF-8): Biblioteka D-BUS
+Group: Libraries
+
+%description libs
+D-BUS library.
+
+%description libs -l pl.UTF-8
+Biblioteka D-BUS.
+
+%package devel
+Summary: Header files for D-BUS library
+Summary(pl.UTF-8): Pliki nagłówkowe biblioteki D-BUS
Group: Development/Libraries
-Requires: %{name} = %{version}
+Requires: %{name}-libs = %{version}-%{release}
-%description glib
-D-BUS add-on library to integrate the standard D-BUS library with the
-GLib thread abstraction and main loop.
+%description devel
+Header files for D-BUS library.
+%description devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki D-BUS.
-%package qt
-Summary: Qt-based library for using D-BUS
+%package static
+Summary: Static D-BUS library
+Summary(pl.UTF-8): Statyczna biblioteka D-BUS
Group: Development/Libraries
-Requires: %{name} = %{version}
+Requires: %{name}-devel = %{version}-%{release}
-%description qt
-D-BUS add-on library to integrate the standard D-BUS library with the
-Qt thread abstraction and main loop.
+%description static
+Static D-BUS library.
+
+%description static -l pl.UTF-8
+Statyczna biblioteka D-BUS.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
%build
%{__libtoolize}
%{__aclocal}
%{__autoconf}
+%{__autoheader}
%{__automake}
-COMMON_ARGS="--enable-glib=yes --enable-qt=yes"
-export QTDIR=/usr
-
-%configure $COMMON_ARGS \
+%configure \
+ %{?debug:--enable-verbose-mode} \
+ --disable-asserts \
--disable-tests \
- --disable-verbose-mode \
- --disable-asserts
+ --enable-abstract-sockets=auto \
+ %{?with_selinux:--enable-selinux} \
+ --with-console-auth-dir=%{_localstatedir}/run/console/ \
+ --with-session-socket-dir=/tmp \
+ --with-system-pid-file=%{_localstatedir}/run/dbus.pid \
+ --with-xml=expat
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT/etc/{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}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-## %find_lang %{gettext_package}
+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
+
+# 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
%clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
%pre
-# Add the "messagebus" user
-#/usr/sbin/useradd -c 'System message bus' -u 81 \
-# -s /sbin/nologin -r -d '/' messagebus 2> /dev/null || :
+%groupadd -g 122 messagebus
+%useradd -u 122 -d /usr/share/empty -s /bin/false -c "System message bus" -g 122 messagebus
%post
-/sbin/ldconfig
-#/sbin/chkconfig --add messagebus
+/sbin/chkconfig --add messagebus
+%service messagebus restart "D-Bus daemon"
%preun
-#if [ $1 = 0 ]; then
-# service messagebus stop > /dev/null 2>&1
-# /sbin/chkconfig --del messagebus
-#fi
+if [ "$1" = "0" ];then
+ %service messagebus stop
+ /sbin/chkconfig --del messagebus
+fi
%postun
-/sbin/ldconfig
-#if [ "$1" -ge "1" ]; then
-# service messagebus condrestart > /dev/null 2>&1
-#fi
+if [ "$1" = "0" ]; then
+ %userremove messagebus
+ %groupremove messagebus
+fi
+
+%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
-%post glib -p /sbin/ldconfig
-%postun glib -p /sbin/ldconfig
-
-%post qt -p /sbin/ldconfig
-%postun qt -p /sbin/ldconfig
-
-## -f %{gettext_package}.lang
%files
%defattr(644,root,root,755)
-%doc COPYING ChangeLog NEWS
+%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/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
+%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*
+
+%files dirs
+%defattr(644,root,root,755)
%dir %{_sysconfdir}/dbus-1
-%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/dbus-1/*.conf
-#/etc/rc.d/init.d/*
%dir %{_sysconfdir}/dbus-1/system.d
-%dir %{_localstatedir}/run/dbus
-%dir %{_libdir}/dbus-*
-%attr(755,root,root) %{_bindir}/*
-%{_libdir}/*dbus-1*.so.*
-%{_mandir}/man*/*
-#%{_libdir}/dbus-1.0/services
+%dir %{_sysconfdir}/dbus-1/session.d
-%files devel
+%files libs
%defattr(644,root,root,755)
-%{_libdir}/libdbus-1*.so
-%{_libdir}/libdbus-1*.la
-%{_libdir}/dbus-*/include
-%{_pkgconfigdir}/*
-%{_includedir}/*
-%{_libdir}/lib*.a
-
-%files glib
-%defattr(644,root,root,755)
-%{_libdir}/*glib*.so.*.*
+%doc AUTHORS COPYING ChangeLog NEWS README doc/TODO
+%attr(755,root,root) /%{_lib}/libdbus-1.so.*.*.*
+%attr(755,root,root) %ghost /%{_lib}/libdbus-1.so.3
-%files qt
+%files devel
+%defattr(644,root,root,755)
+%doc doc/*.{html,txt}
+%attr(755,root,root) %{_libdir}/libdbus-1.so
+%{_libdir}/libdbus-1.la
+%dir %{_libdir}/dbus-1.0
+%{_libdir}/dbus-1.0/include
+%{_pkgconfigdir}/dbus-1.pc
+%{_includedir}/dbus-1.0
+
+%files static
%defattr(644,root,root,755)
-%{_libdir}/*qt*.so.*.*
+%{_libdir}/libdbus-1.a