diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,6 +1,6 @@ name : dbus version : 1.14.4 -release : 34 +release : 35 source : - https://dbus.freedesktop.org/releases/dbus/dbus-1.14.4.tar.xz : 7c0f9b8e5ec0ff2479383e62c0084a3a29af99edf1514e9f659b81b30d4e353e license : @@ -22,6 +22,8 @@ patterns : - devel : /usr/lib64/dbus-1.0/include/ - 32bit-devel : /usr/lib32/dbus-1.0/include/ + - docs : + - /usr/share/doc - launch : - /usr/bin/dbus-launch - /usr/share/man/man1/dbus-launch.1 @@ -61,3 +63,13 @@ else chmod o+x $installdir/%libdir%/dbus-1.0/dbus-daemon-launch-helper fi + + if [[ -z "${EMUL32BUILD}" ]]; then + # Remove dbus.service in favor of dbus-broker + rm -v $installdir/%libdir%/systemd/system/dbus.service + rm -v $installdir/%libdir%/systemd/system/multi-user.target.wants/dbus.service + rmdir $installdir/%libdir%/systemd/system/multi-user.target.wants/ + + # And for user services + rm -v $installdir/%libdir%/systemd/user/dbus.service + fi diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -2,8 +2,8 @@ dbus - Joey Riches - josephriches@gmail.com + Reilly Brogan + solus@reillybrogan.com GPL-2.0-or-later LGPL-2.1-or-later @@ -31,11 +31,8 @@ /usr/lib64/dbus-1.0/dbus-daemon-launch-helper /usr/lib64/libdbus-1.so.3 /usr/lib64/libdbus-1.so.3.32.1 - /usr/lib64/systemd/system/dbus.service /usr/lib64/systemd/system/dbus.socket - /usr/lib64/systemd/system/multi-user.target.wants/dbus.service /usr/lib64/systemd/system/sockets.target.wants/dbus.socket - /usr/lib64/systemd/user/dbus.service /usr/lib64/systemd/user/dbus.socket /usr/lib64/systemd/user/sockets.target.wants/dbus.socket /usr/lib64/sysusers.d/dbus.conf @@ -46,26 +43,6 @@ /usr/share/dbus-1/system-services /usr/share/dbus-1/system.conf /usr/share/dbus-1/system.d - /usr/share/doc/dbus/dbus-cleanup-sockets.1.html - /usr/share/doc/dbus/dbus-daemon.1.html - /usr/share/doc/dbus/dbus-faq.html - /usr/share/doc/dbus/dbus-launch.1.html - /usr/share/doc/dbus/dbus-monitor.1.html - /usr/share/doc/dbus/dbus-run-session.1.html - /usr/share/doc/dbus/dbus-send.1.html - /usr/share/doc/dbus/dbus-specification.html - /usr/share/doc/dbus/dbus-test-plan.html - /usr/share/doc/dbus/dbus-test-tool.1.html - /usr/share/doc/dbus/dbus-tutorial.html - /usr/share/doc/dbus/dbus-update-activation-environment.1.html - /usr/share/doc/dbus/dbus-uuidgen.1.html - /usr/share/doc/dbus/diagram.png - /usr/share/doc/dbus/diagram.svg - /usr/share/doc/dbus/examples/GetAllMatchRules.py - /usr/share/doc/dbus/examples/example-session-disable-stats.conf - /usr/share/doc/dbus/examples/example-system-enable-stats.conf - /usr/share/doc/dbus/examples/example-system-hardening-without-traditional-activation.conf - /usr/share/doc/dbus/system-activation.txt /usr/share/man/man1/dbus-cleanup-sockets.1 /usr/share/man/man1/dbus-daemon.1 /usr/share/man/man1/dbus-monitor.1 @@ -86,7 +63,7 @@ emul32 - dbus + dbus /usr/lib32/cmake/DBus1/DBus1Config.cmake @@ -102,8 +79,8 @@ programming.devel - dbus-32bit - dbus-devel + dbus-32bit + dbus-devel /usr/lib32/dbus-1.0/include/dbus/dbus-arch-deps.h @@ -118,7 +95,7 @@ system.devel - dbus + dbus /usr/include/dbus-1.0/dbus/dbus-address.h @@ -145,6 +122,35 @@ /usr/lib64/pkgconfig/dbus-1.pc + + dbus-docs + Documentation for dbus + D-Bus is a message bus system, a simple way for applications to talk to oneg another. D-Bus supplies both a system daemon (for events such as "new hardware device added" or "printer queue changed") and a per-user login-session daemon (for general IPC needs among user applications). Also, the message bus is built on top of a general one-to-one message passing framework, which can be used by any two applications to communicate directly (without going through the message bus daemon). + + programming.docs + + /usr/share/doc/dbus/dbus-cleanup-sockets.1.html + /usr/share/doc/dbus/dbus-daemon.1.html + /usr/share/doc/dbus/dbus-faq.html + /usr/share/doc/dbus/dbus-launch.1.html + /usr/share/doc/dbus/dbus-monitor.1.html + /usr/share/doc/dbus/dbus-run-session.1.html + /usr/share/doc/dbus/dbus-send.1.html + /usr/share/doc/dbus/dbus-specification.html + /usr/share/doc/dbus/dbus-test-plan.html + /usr/share/doc/dbus/dbus-test-tool.1.html + /usr/share/doc/dbus/dbus-tutorial.html + /usr/share/doc/dbus/dbus-update-activation-environment.1.html + /usr/share/doc/dbus/dbus-uuidgen.1.html + /usr/share/doc/dbus/diagram.png + /usr/share/doc/dbus/diagram.svg + /usr/share/doc/dbus/examples/GetAllMatchRules.py + /usr/share/doc/dbus/examples/example-session-disable-stats.conf + /usr/share/doc/dbus/examples/example-system-enable-stats.conf + /usr/share/doc/dbus/examples/example-system-hardening-without-traditional-activation.conf + /usr/share/doc/dbus/system-activation.txt + + dbus-launch X11 dbus-launch helper @@ -152,7 +158,7 @@ desktop.core - dbus + dbus /usr/bin/dbus-launch @@ -160,12 +166,12 @@ - - 2022-11-02 + + 2023-08-02 1.14.4 Packaging update - Joey Riches - josephriches@gmail.com + Reilly Brogan + solus@reillybrogan.com \ No newline at end of file