+# TODO:
+# - enable ducktype-docs when it works
+# - move /etc/dbus-1 from -libs to base after external packages transition to /usr/share/dbus-1
#
# Conditional build:
-%bcond_without selinux # build without SELinux support
-%bcond_without X11 # build without X11 support
+%bcond_without apparmor # AppArmor support
+%bcond_without selinux # SELinux support
+%bcond_without systemd # systemd at_console support
+%bcond_without X11 # X11 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: 1.8.16
-Release: 4
-License: AFL v2.1 or GPL v2
+Version: 1.12.20
+Release: 2
+License: AFL v2.1 or GPL v2+
Group: Libraries
-Source0: http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz
-# Source0-md5: 020824a38850501e7d6ba8307a7c5ac3
+Source0: https://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz
+# Source0-md5: dfe8a71f412e0b53be26ed4fbfdc91c4
Source1: messagebus.init
Source2: %{name}-daemon-1-profile.d-sh
Source3: %{name}-sysconfig
Patch1: %{name}-config.patch
Patch2: %{name}-no_fatal_checks.patch
Patch3: %{name}-allow-introspection.patch
-URL: http://www.freedesktop.org/Software/dbus
+Patch4: %{name}-autoconf-archive.patch
+URL: https://www.freedesktop.org/Software/dbus
BuildRequires: audit-libs-devel
BuildRequires: autoconf >= 2.63
-BuildRequires: automake >= 1:1.10
+BuildRequires: autoconf-archive >= 2019.01.06
+BuildRequires: automake >= 1:1.13
BuildRequires: docbook-dtd44-xml
BuildRequires: doxygen
BuildRequires: expat-devel >= %{expat_version}
+%{?with_apparmor:BuildRequires: libapparmor-devel >= 1:2.10}
BuildRequires: libcap-ng-devel
-%{?with_selinux:BuildRequires: libselinux-devel}
+%{?with_selinux:BuildRequires: libselinux-devel >= 2.0.86}
BuildRequires: libtool >= 2:2.0
BuildRequires: libxslt-progs
BuildRequires: pkgconfig
-BuildRequires: rpmbuild(macros) >= 1.626
+#BuildRequires: python3-ducktype
+BuildRequires: rpm-build >= 4.6
+BuildRequires: rpmbuild(macros) >= 2.011
BuildRequires: sed >= 4.0
-BuildRequires: systemd-devel >= 32
+%{?with_systemd:BuildRequires: systemd-devel >= 32}
BuildRequires: xmlto
%{?with_X11:BuildRequires: xorg-lib-libX11-devel}
+BuildRequires: yelp-tools
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(post,preun,postun): systemd-units >= 38
+Requires(post,preun,postun): systemd-units >= 250.1
Requires: %{name}-libs = %{version}-%{release}
Requires: expat >= %{expat_version}
+%{?with_apparmor:Requires: libapparmor >= 1:2.10}
+%{?with_selinux:Requires: libselinux >= 2.0.86}
Requires: rc-scripts >= 0.4.3.0
-Requires: systemd-units >= 38
+Requires: systemd-units >= 250.1
Provides: group(messagebus)
Provides: user(messagebus)
Obsoletes: dbus-glib-tools
Summary: D-BUS library
Summary(pl.UTF-8): Biblioteka D-BUS
Group: Libraries
+%{?with_systemd:Requires: systemd-libs >= 32}
Obsoletes: dbus-dirs
%description libs
Summary(pl.UTF-8): Pliki nagłówkowe biblioteki D-BUS
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
+%{?with_systemd:Requires: systemd-devel >= 32}
%description devel
Header files for D-BUS library.
Group: Documentation
# dbus.devhelp refers also to common docs packaged in -devel
Requires: %{name}-devel = %{version}-%{release}
+BuildArch: noarch
%description apidocs
D-BUS API documentation.
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
+
+%{__sed} -i -e '1s,/usr/bin/env python,%{__python},' tools/GetAllMatchRules.py
%build
%{__libtoolize}
%{__autoheader}
%{__automake}
%configure \
- %{?debug:--enable-verbose-mode} \
+ %{!?with_apparmor:--disable-apparmor} \
--disable-asserts \
+ --disable-ducktype-docs \
+ %{?debug:--enable-verbose-mode} \
+ %{!?with_selinux:--disable-selinux} \
--disable-silent-rules \
+ %{!?with_systemd:--disable-systemd} \
--disable-tests \
- --enable-abstract-sockets=auto \
- %{?with_selinux:--enable-selinux} \
+ --enable-user-session \
--with-console-auth-dir=%{_localstatedir}/run/console/ \
--with-session-socket-dir=/tmp \
--with-system-pid-file=%{_localstatedir}/run/dbus.pid \
cp -p %{SOURCE5} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{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
-
+%if %{with systemd}
ln -s dbus.service $RPM_BUILD_ROOT%{systemdunitdir}/messagebus.service
+# we are creating messagebus user from rpm pre
+%{__rm} $RPM_BUILD_ROOT/usr/lib/sysusers.d/dbus.conf
+%endif
+
+# for local configuration in dbus 1.10+
+install -d $RPM_BUILD_ROOT/etc/dbus-1/{session.d,system.d}
+
%clean
rm -rf $RPM_BUILD_ROOT
%service -n messagebus restart "D-Bus daemon"
export NORESTART="yes"
%systemd_post messagebus.service
+%systemd_user_post dbus.service dbus.socket
%preun
if [ "$1" = "0" ];then
%service messagebus stop
/sbin/chkconfig --del messagebus
fi
+%systemd_user_preun dbus.service dbus.socket
%postun
if [ "$1" = "0" ]; then
%attr(755,root,root) %{_bindir}/dbus-monitor
%attr(755,root,root) %{_bindir}/dbus-run-session
%attr(755,root,root) %{_bindir}/dbus-send
-%attr(4754,root,messagebus) %{_libdir}/dbus-daemon-launch-helper
-%dir %{_datadir}/dbus-1/services
-%dir %{_datadir}/dbus-1/system-services
-%config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/*.conf
+%attr(755,root,root) %{_bindir}/dbus-test-tool
+%attr(755,root,root) %{_bindir}/dbus-update-activation-environment
+%attr(4754,root,messagebus) %{_libexecdir}/dbus-daemon-launch-helper
+%{_datadir}/dbus-1/session.conf
+%{_datadir}/dbus-1/system.conf
+%{_datadir}/xml/dbus-1
+%config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/session.conf
+%config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.conf
%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/messagebus
%attr(754,root,root) /etc/rc.d/init.d/messagebus
%attr(755,root,root) /etc/profile.d/dbus-daemon-1.sh
%{_mandir}/man1/dbus-monitor.1*
%{_mandir}/man1/dbus-run-session.1*
%{_mandir}/man1/dbus-send.1*
+%{_mandir}/man1/dbus-test-tool.1*
+%{_mandir}/man1/dbus-update-activation-environment.1*
+%if %{with systemd}
%{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
+%{systemduserunitdir}/dbus.service
+%{systemduserunitdir}/dbus.socket
+%{systemduserunitdir}/sockets.target.wants/dbus.socket
+%endif
%files libs
%defattr(644,root,root,755)
%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
-%dir /etc/dbus-1
-%dir /etc/dbus-1/system.d
-%dir /etc/dbus-1/session.d
+%attr(755,root,root) %{_libdir}/libdbus-1.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libdbus-1.so.3
%dir %{_datadir}/dbus-1
+%dir %{_datadir}/dbus-1/session.d
+%dir %{_datadir}/dbus-1/system.d
# interfaces is basically devel thing, but keep dir here
# in case something uses it at runtime
%dir %{_datadir}/dbus-1/interfaces
+%dir %{_datadir}/dbus-1/services
+%dir %{_datadir}/dbus-1/system-services
+# TODO: now it's only for local configuration - move to base dbus package
+# after all packages place constant configuration in %{_datadir}/dbus-1
+%dir /etc/dbus-1
+%dir /etc/dbus-1/session.d
+%dir /etc/dbus-1/system.d
%files devel
%defattr(644,root,root,755)
%{_libdir}/libdbus-1.la
%dir %{_libdir}/dbus-1.0
%{_libdir}/dbus-1.0/include
+%{_libdir}/cmake/DBus1
%{_includedir}/dbus-1.0
%{_pkgconfigdir}/dbus-1.pc
%dir %{_docdir}/dbus
%{_docdir}/dbus/*.svg
%{_docdir}/dbus/*.txt
-
%files static
%defattr(644,root,root,755)
%{_libdir}/libdbus-1.a
%files apidocs
%defattr(644,root,root,755)
%{_docdir}/dbus/api
-%{_docdir}/dbus/dbus.devhelp
+%{_docdir}/dbus/dbus.devhelp2
%files x11
%defattr(644,root,root,755)
projects / packages / dbus.git / blobdiff