%define with_systemd 1
-BuildRequires: libzio
+BuildRequires: autoconf-archive
BuildRequires: libtool
BuildRequires: pkg-config
BuildRequires: expat-devel
BuildRequires: pkgconfig(cynara-session)
BuildRequires: pkgconfig(cynara-client-async)
BuildRequires: pkgconfig(libdbuspolicy1)
-Version: 1.10.6
+Version: 1.12.16
Release: 3
Source0: http://dbus.freedesktop.org/releases/dbus/dbus-%{version}.tar.gz
Source3: dbus_at_console.ck
%package devel
Summary: Developer package for D-Bus
-License: AFL-2.1, BSD-3-Clause, LGPL-2.1+, MIT
+License: AFL-2.1
Group: Development/Libraries
Requires: dbus-libs = %{version}
%package libs
Summary: Library package for D-Bus
-License: AFL-2.1, BSD-3-Clause, LGPL-2.1+, MIT
+License: AFL-2.1
Group: System/Libraries
%description libs
%package -n dbus-libs-extension-kdbus
Summary: Extension for dbus to support KDBUS in Tizen
+License: AFL-2.1
Requires: dbus = %{version}-%{release}
%description -n dbus-libs-extension-kdbus
export V=1
# Create kdbus extension first (dbus)
-%reconfigure \
- --disable-static \
- --with-pic \
- --with-dbus-user=dbus \
- --libexecdir=%{_libdir}/%{name} \
- --libdir=%{_libdir} \
- --with-init-scripts=suse \
- --enable-inotify \
- --disable-doxygen-docs \
- --disable-xml-docs \
+%reconfigure \
+ --disable-static \
+ --with-pic \
+ --with-dbus-user=dbus \
+ --libexecdir=%{_libdir}/%{name} \
+ --libdir=%{_libdir} \
+ --enable-inotify \
+ --disable-doxygen-docs \
+ --disable-xml-docs \
%if %{with_systemd}
- --enable-systemd \
+ --enable-systemd \
%endif
- --enable-kdbus-transport \
- --enable-libdbuspolicy \
- --with-system-pid-file=/tmp/dbus_launch \
- --with-console-auth-dir=/var/run/dbus/at_console/ \
- --with-systemdsystemunitdir=%{_unitdir} \
- --with-systemduserunitdir=%{_unitdir_user} \
- --enable-user-session \
- --enable-cynara \
- --enable-modular-tests \
+ --enable-kdbus-transport \
+ --enable-libdbuspolicy \
+ --with-console-auth-dir=/var/run/dbus/at_console/ \
+ --with-system-socket=/run/dbus/system_bus_socket \
+ --with-systemdsystemunitdir=%{_unitdir} \
+ --with-systemduserunitdir=%{_unitdir_user} \
+ --enable-user-session \
+ --enable-cynara \
+ --enable-modular-tests \
--enable-installed-tests
make %{?_smp_mflags}
# WARNING: if coverage build is enabled, incremental builds will not work correctly.
# Use the option only to generate dbus-coverage packages.
%if %{with coverage}
-%reconfigure \
- --disable-static \
- --with-pic \
- --with-dbus-user=dbus \
- --libexecdir=%{_libdir}/%{name} \
- --libdir=%{_libdir} \
- --with-init-scripts=suse \
- --enable-inotify \
- --disable-doxygen-docs \
- --disable-xml-docs \
+%reconfigure \
+ --disable-static \
+ --with-pic \
+ --with-dbus-user=dbus \
+ --libexecdir=%{_libdir}/%{name} \
+ --libdir=%{_libdir} \
+ --enable-inotify \
+ --disable-doxygen-docs \
+ --disable-xml-docs \
%if %{with_systemd}
- --enable-systemd \
+ --enable-systemd \
%endif
- --enable-kdbus-transport \
- --enable-libdbuspolicy \
- --with-system-pid-file=/tmp/dbus_launch \
- --with-console-auth-dir=/var/run/dbus/at_console/ \
- --with-systemdsystemunitdir=%{_unitdir} \
- --with-systemduserunitdir=%{_unitdir_user} \
- --enable-user-session \
- --enable-cynara \
- --enable-modular-tests \
- --enable-installed-tests \
- --enable-compiler-coverage
+ --enable-kdbus-transport \
+ --enable-libdbuspolicy \
+ --with-console-auth-dir=/var/run/dbus/at_console/ \
+ --with-system-socket=/run/dbus/system_bus_socket \
+ --with-systemdsystemunitdir=%{_unitdir} \
+ --with-systemduserunitdir=%{_unitdir_user} \
+ --enable-user-session \
+ --enable-cynara \
+ --enable-modular-tests \
+ --enable-installed-tests \
+ --enable-compiler-coverage
+
make %{?_smp_mflags}
mkdir coverage
cp dbus/.libs/libdbus-1.so.3 coverage
%endif
-%reconfigure \
- --disable-static \
- --with-pic \
- --with-dbus-user=dbus \
- --libexecdir=%{_libdir}/%{name} \
- --libdir=%{_libdir} \
- --with-init-scripts=suse \
- --enable-inotify \
- --disable-doxygen-docs \
- --disable-xml-docs \
+%reconfigure \
+ --disable-static \
+ --with-pic \
+ --with-dbus-user=dbus \
+ --libexecdir=%{_libdir}/%{name} \
+ --libdir=%{_libdir} \
+ --enable-inotify \
+ --disable-doxygen-docs \
+ --disable-xml-docs \
%if %{with_systemd}
- --enable-systemd \
+ --enable-systemd \
%endif
- --with-system-pid-file=/tmp/dbus_launch \
- --with-console-auth-dir=/var/run/dbus/at_console/ \
- --with-systemdsystemunitdir=%{_unitdir} \
- --with-systemduserunitdir=%{_unitdir_user} \
- --enable-user-session \
- --enable-cynara \
- --enable-modular-tests \
+ --with-console-auth-dir=/var/run/dbus/at_console/ \
+ --with-system-socket=/run/dbus/system_bus_socket \
+ --with-systemdsystemunitdir=%{_unitdir} \
+ --with-systemduserunitdir=%{_unitdir_user} \
+ --enable-user-session \
+ --enable-cynara \
+ --enable-modular-tests \
--enable-installed-tests
make %{?_smp_mflags}
mkdir -p %{buildroot}/%{_datadir}/dbus-1/system-services
mkdir -p %{buildroot}/%{_datadir}/dbus-1/interfaces
#
-chmod a-x AUTHORS COPYING HACKING NEWS README doc/*.txt doc/file-boilerplate.c doc/TODO
+chmod a-x AUTHORS CONTRIBUTING.md NEWS README doc/*.txt doc/file-boilerplate.c doc/TODO
#
install -d %{buildroot}%{_sysconfdir}/ConsoleKit/run-session.d
install -m 755 %{SOURCE3} %{buildroot}%{_sysconfdir}/ConsoleKit/run-session.d
# Set the smack label of executable binary tools
chsmack %{_bindir}/dbus-cleanup-sockets -a "System::Tools"
chsmack %{_bindir}/dbus-daemon -a "System::Tools"
-chsmack %{_bindir}/dbus-monitor -a "System::Tools"
+chsmack %{_bindir}/dbus-monitor -a "System::Tools" -e "System"
chsmack %{_bindir}/dbus-run-session -a "System::Tools"
chsmack %{_bindir}/dbus-send -a "System::Tools"
chsmack %{_bindir}/dbus-uuidgen -a "System::Tools"
%files -n dbus-libs-extension-kdbus
%manifest %{name}.manifest
-%license COPYING LICENSE.AFL-2.1 LICENSE.BSD-3-Clause LICENSE.LGPL-2.1+ LICENSE.MIT
+%license LICENSE.AFL-2.1
%{_libdir}/libdbus*.so.*.extension-kdbus
%post libs -p /sbin/ldconfig
%files
%manifest %{name}.manifest
-%license COPYING LICENSE.AFL-2.1 LICENSE.BSD-3-Clause LICENSE.LGPL-2.1+ LICENSE.MIT LICENSE.GPL-2.0+
+%license LICENSE.AFL-2.1 LICENSE.BSD-3-Clause LICENSE.LGPL-2.1+ LICENSE.MIT LICENSE.GPL-2.0+
%defattr(-, root, root)
%dir /lib/dbus-1
%dir /lib/dbus-1/system-services
%{_unitdir}/dbus.service
%dir %{_unitdir}/sockets.target.wants
%{_unitdir}/sockets.target.wants/dbus.socket
-%dir %{_unitdir}/dbus.target.wants
-%{_unitdir}/dbus.target.wants/dbus.socket
%dir %{_unitdir_user}
%{_unitdir_user}/dbus.socket
%{_unitdir_user}/dbus.service
%dir %{_datadir}/dbus-1/services
%dir %{_datadir}/dbus-1/system-services
%{_sysconfdir}/profile.d/dbus.sh
+%{_prefix}/lib/sysusers.d/dbus.conf
+%{_prefix}/lib/tmpfiles.d/dbus.conf
%files libs
%manifest %{name}.manifest
-%license COPYING LICENSE.AFL-2.1 LICENSE.BSD-3-Clause LICENSE.LGPL-2.1+ LICENSE.MIT
+%license LICENSE.AFL-2.1
%exclude %{_libdir}/libdbus*.so.*.extension-kdbus
%defattr(-, root, root)
%{_libdir}/libdbus-1.so.*
%files devel
%manifest %{name}.manifest
-%license COPYING LICENSE.AFL-2.1 LICENSE.BSD-3-Clause LICENSE.LGPL-2.1+ LICENSE.MIT
+%license LICENSE.AFL-2.1
%defattr(-,root,root)
%{_includedir}/*
%{_libdir}/libdbus-1.so
%{_libdir}/dbus-1.0/include
%{_libdir}/pkgconfig/dbus-1.pc
%dir %{_libdir}/dbus-1.0
+%{_libdir}/cmake/DBus1/DBus1Config.cmake
+%{_libdir}/cmake/DBus1/DBus1ConfigVersion.cmake
+%{_datadir}/xml/dbus-1/busconfig.dtd
+%{_datadir}/xml/dbus-1/introspect.dtd
%files tests
%manifest %{name}.manifest
-%license LICENSE.MIT
+%license LICENSE.MIT LICENSE.AFL-2.1
%defattr(-,root,root)
%{_libdir}/dbus-tests/test-suites/dbus-tests
%{_libdir}/dbus-tests/runner/dbus-tests