diff options
| -rw-r--r-- | packaging/dbus.spec | 112 |
1 files changed, 58 insertions, 54 deletions
diff --git a/packaging/dbus.spec b/packaging/dbus.spec index fbbc2c42..93db9c14 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} |