From: INSUN PYO <insun.pyo@samsung.com>
Date: Wed, 5 Aug 2020 07:10:56 +0000 (+0900)
Subject: spec: change system bus socket location: /var/run/dbus/system_bus_socket → /run/dbus... 
X-Git-Tag: accepted/tizen/unified/20200819.122321^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1248b67f625a43e6c6e596b738cbc323f577b208;p=platform%2Fupstream%2Fdbus.git

spec: change system bus socket location: /var/run/dbus/system_bus_socket → /run/dbus/system_bus_socket

Journal Log
 - Jan 01 09:11:45 localhost systemd[1]: /usr/lib/systemd/system/dbus.socket:8: ListenStream= references a path below legacy directory /var/run/, updating /var/run/dbus/system_bus_socket → /run/dbus/system_bus_socket; please update the unit file accordingly

Change-Id: Idf5d68e791efc70ef324a0ba50807a5512815ac7
Ref: https://gitlab.freedesktop.org/dbus/dbus/-/issues/180
---

diff --git a/packaging/dbus.spec b/packaging/dbus.spec
index fbbc2c4..93db9c1 100644
--- a/packaging/dbus.spec
+++ b/packaging/dbus.spec
@@ -125,26 +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}							\
-    --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,28 +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}							\
-    --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
@@ -192,24 +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}							\
-    --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}