#
+# Conditional build:
+%bcond_without selinux # build without SELinux support
+%bcond_without X11 # build without X11 support
+
%define expat_version 1:1.95.5
-#
Summary: D-BUS message bus
-Summary(pl): Magistrala przesy³ania komunikatów D-BUS
+Summary(pl.UTF-8): Magistrala przesyłania komunikatów D-BUS
Name: dbus
-Version: 0.92
-Release: 3
+Version: 1.4.0
+Release: 2
License: AFL v2.1 or GPL v2
Group: Libraries
-Source0: http://dbus.freedesktop.org/releases/%{name}-%{version}.tar.gz
-# Source0-md5: ea2be58c80a80631ba5b3c92cffd335c
+Source0: http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz
+# Source0-md5: f59618b18d2fb2bd1fce9e1c5a2a3282
Source1: messagebus.init
Source2: %{name}-daemon-1-profile.d-sh
Source3: %{name}-sysconfig
Source4: %{name}-xinitrc.sh
+Source5: messagebus.upstart
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
+BuildRequires: automake >= 1:1.9
BuildRequires: doxygen
BuildRequires: expat-devel >= %{expat_version}
-BuildRequires: libselinux-devel
+BuildRequires: libcap-ng-devel
+%{?with_selinux:BuildRequires: libselinux-devel}
BuildRequires: libtool
BuildRequires: pkgconfig
-BuildRequires: rpmbuild(macros) >= 1.268
+BuildRequires: rpmbuild(macros) >= 1.561
BuildRequires: sed >= 4.0
BuildRequires: xmlto
-BuildRequires: xorg-lib-libX11-devel
+%{?with_X11:BuildRequires: xorg-lib-libX11-devel}
Requires(post,postun): /sbin/ldconfig
Requires(post,preun): /sbin/chkconfig
Requires(postun): /usr/sbin/groupdel
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: rc-scripts
+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
used both for the systemwide message bus service, and as a
per-user-login-session messaging facility.
-%description -l pl
-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 -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.
+
+%package upstart
+Summary: Upstart job description for system message bus
+Summary(pl.UTF-8): Opis zadania Upstart dla magistrali systemowej DBus
+Group: Daemons
+Requires: %{name} = %{version}-%{release}
+Requires: upstart >= 0.6
+
+%description upstart
+Upstart job description for system message bus.
+
+%description upstart -l pl.UTF-8
+Opis zadania Upstart dla magistrali systemowej DBus.
+
+%package dirs
+Summary: D-BUS directories
+Summary(pl.UTF-8): Katalogi D-BUS
+Group: Libraries
+
+%description dirs
+D-BUS directories.
+
+%description dirs -l pl.UTF-8
+Katalogi D-BUS.
%package libs
-Summary: D-BUS libraries
-Summary(pl): Biblioteki D-BUS
+Summary: D-BUS library
+Summary(pl.UTF-8): Biblioteka D-BUS
Group: Libraries
%description libs
-D-BUS libraries.
+D-BUS library.
-%description libs -l pl
-Biblioteki D-BUS.
+%description libs -l pl.UTF-8
+Biblioteka D-BUS.
%package devel
-Summary: Header files for D-BUS
-Summary(pl): Pliki nag³ówkowe D-BUS
+Summary: Header files for D-BUS library
+Summary(pl.UTF-8): Pliki nagłówkowe biblioteki D-BUS
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
%description devel
-Header files for D-BUS.
+Header files for D-BUS library.
-%description devel -l pl
-Pliki nag³ówkowe D-BUS.
+%description devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki D-BUS.
%package static
-Summary: Static D-BUS libraries
-Summary(pl): Statyczne biblioteki D-BUS
+Summary: Static D-BUS library
+Summary(pl.UTF-8): Statyczna biblioteka D-BUS
Group: Development/Libraries
Requires: %{name}-devel = %{version}-%{release}
%description static
-Static D-BUS libraries.
+Static D-BUS library.
-%description static -l pl
-Statyczne biblioteki D-BUS.
+%description static -l pl.UTF-8
+Statyczna biblioteka D-BUS.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
+%patch3 -p1
%build
%{__libtoolize}
%{__automake}
%configure \
%{?debug:--enable-verbose-mode} \
+ --disable-silent-rules \
--disable-asserts \
--disable-tests \
- --enable-abstract-sockets \
- --enable-selinux \
- --with-console-auth-dir=%{_localstatedir}/lock/console/ \
+ --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
+ --with-xml=expat \
+ %{!?with_X11:--without-x}
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/profile.d
-install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
-install -d $RPM_BUILD_ROOT/etc/sysconfig
-install -d $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d
-install -d $RPM_BUILD_ROOT%{_datadir}/dbus-1/services
-install -d $RPM_BUILD_ROOT%{_localstatedir}/run/dbus
+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}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
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
+
+# 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 $RPM_BUILD_ROOT
%pre
%groupadd -g 122 messagebus
-%useradd -u 122 -d /usr/share/empty -s /bin/false -c "System message bus" -g messagebus messagebus
+%useradd -u 122 -d /usr/share/empty -s /bin/false -c "System message bus" -g 122 messagebus
%post
/sbin/chkconfig --add messagebus
%groupremove messagebus
fi
+%post upstart
+%upstart_post messagebus
+
+%postun upstart
+%upstart_postun messagebus
+
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
EOF
if [ -f /etc/sysconfig/dbus ]; then
- mv /etc/sysconfig/dbus /etc/sysconfig/messagebus
+ 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
-%dir %{_sysconfdir}/dbus-1
+%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 %{_sysconfdir}/dbus-1/system.d
-%dir %{_datadir}/dbus-1
-%dir %{_datadir}/dbus-1/services
%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 upstart
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) /etc/init/messagebus.conf
+
+%files dirs
+%defattr(644,root,root,755)
+%dir %{_sysconfdir}/dbus-1
+%dir %{_sysconfdir}/dbus-1/system.d
+%dir %{_sysconfdir}/dbus-1/session.d
+
%files libs
%defattr(644,root,root,755)
%doc AUTHORS COPYING ChangeLog NEWS README doc/TODO
-%attr(755,root,root) %{_libdir}/libdbus-1.so.*.*.*
-%dir %{_libdir}/dbus-*
+%attr(755,root,root) /%{_lib}/libdbus-1.so.*.*.*
+%attr(755,root,root) %ghost /%{_lib}/libdbus-1.so.3
%files devel
%defattr(644,root,root,755)
%doc doc/*.{html,txt}
%attr(755,root,root) %{_libdir}/libdbus-1.so
%{_libdir}/libdbus-1.la
-%{_libdir}/dbus-*/include
+%dir %{_libdir}/dbus-1.0
+%{_libdir}/dbus-1.0/include
%{_pkgconfigdir}/dbus-1.pc
-%{_includedir}/dbus*
+%{_includedir}/dbus-1.0
%files static
%defattr(644,root,root,755)
projects / packages / dbus.git / blobdiff