projects / platform / upstream / dbus.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
spec: change system bus socket location: /var/run/dbus/system_bus_socket → /run/dbus...
[platform/upstream/dbus.git] / packaging / dbus.spec
diff --git a/packaging/dbus.spec b/packaging/dbus.spec
index 404a123..93db9c1 100644 (file)
--- a/packaging/dbus.spec
+++ b/packaging/dbus.spec
@@ -13,7 +13,7 @@ Group:          Base/IPC
 
 %define with_systemd 1
 
-BuildRequires:  libzio
+BuildRequires:  autoconf-archive
 BuildRequires:  libtool
 BuildRequires:  pkg-config
 BuildRequires:  expat-devel
@@ -26,7 +26,7 @@ BuildRequires:  pkgconfig(cynara-client)
 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
@@ -52,7 +52,7 @@ This package provides dbus-daemon.
 
 %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}
 
@@ -64,7 +64,7 @@ This package provides development libraries.
 
 %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
@@ -100,6 +100,7 @@ This package is intended for debug/test use only.
 
 %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
@@ -124,27 +125,27 @@ export CXXFLAGS="$CXXFLAGS -fstack-protector"
 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-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}
@@ -161,29 +162,30 @@ popd
 # 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-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
@@ -193,25 +195,25 @@ find dbus -name '*.gcno' -exec cp '{}' coverage-objects ';'
 
 %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-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}
@@ -232,7 +234,7 @@ mkdir -p %{buildroot}/lib/dbus-1/system-services
 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
@@ -298,7 +300,7 @@ popd
 
 %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
@@ -308,7 +310,7 @@ popd
 
 %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
@@ -333,17 +335,11 @@ popd
 %{_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 %{_unitdir_user}/sockets.target.wants
 %{_unitdir_user}/sockets.target.wants/dbus.socket
-%{_unitdir}/dbus@.socket
-%{_unitdir}/dbus@.service
-%dir %{_unitdir}/user-sockets@.target.wants
-%{_unitdir}/user-sockets@.target.wants/dbus@.socket
 %dir %{_sysconfdir}/dbus-1
 %dir %{_datadir}/dbus-1/session.d
 %dir %{_datadir}/dbus-1/system.d
@@ -352,27 +348,33 @@ popd
 %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
Domain: System / IPC;