Page MenuHomeSolus
Files F11003091

D14277.diff
No OneTemporary
Actions

D14277.diff
View Options

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 :
@@ -61,3 +61,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 @@
<Source>
<Name>dbus</Name>
<Packager>
- <Name>Joey Riches</Name>
- <Email>josephriches@gmail.com</Email>
+ <Name>Reilly Brogan</Name>
+ <Email>solus@reillybrogan.com</Email>
</Packager>
<License>GPL-2.0-or-later</License>
<License>LGPL-2.1-or-later</License>
@@ -31,11 +31,8 @@
<Path fileType="library">/usr/lib64/dbus-1.0/dbus-daemon-launch-helper</Path>
<Path fileType="library">/usr/lib64/libdbus-1.so.3</Path>
<Path fileType="library">/usr/lib64/libdbus-1.so.3.32.1</Path>
- <Path fileType="library">/usr/lib64/systemd/system/dbus.service</Path>
<Path fileType="library">/usr/lib64/systemd/system/dbus.socket</Path>
- <Path fileType="library">/usr/lib64/systemd/system/multi-user.target.wants/dbus.service</Path>
<Path fileType="library">/usr/lib64/systemd/system/sockets.target.wants/dbus.socket</Path>
- <Path fileType="library">/usr/lib64/systemd/user/dbus.service</Path>
<Path fileType="library">/usr/lib64/systemd/user/dbus.socket</Path>
<Path fileType="library">/usr/lib64/systemd/user/sockets.target.wants/dbus.socket</Path>
<Path fileType="library">/usr/lib64/sysusers.d/dbus.conf</Path>
@@ -86,7 +83,7 @@
</Description>
<PartOf>emul32</PartOf>
<RuntimeDependencies>
- <Dependency release="34">dbus</Dependency>
+ <Dependency release="35">dbus</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib32/cmake/DBus1/DBus1Config.cmake</Path>
@@ -102,8 +99,8 @@
</Description>
<PartOf>programming.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="34">dbus-32bit</Dependency>
- <Dependency release="34">dbus-devel</Dependency>
+ <Dependency release="35">dbus-32bit</Dependency>
+ <Dependency release="35">dbus-devel</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib32/dbus-1.0/include/dbus/dbus-arch-deps.h</Path>
@@ -118,7 +115,7 @@
</Description>
<PartOf>system.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="34">dbus</Dependency>
+ <Dependency release="35">dbus</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include/dbus-1.0/dbus/dbus-address.h</Path>
@@ -152,7 +149,7 @@
</Description>
<PartOf>desktop.core</PartOf>
<RuntimeDependencies>
- <Dependency release="34">dbus</Dependency>
+ <Dependency release="35">dbus</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin/dbus-launch</Path>
@@ -160,12 +157,12 @@
</Files>
</Package>
<History>
- <Update release="34">
- <Date>2022-11-02</Date>
+ <Update release="35">
+ <Date>2023-07-23</Date>
<Version>1.14.4</Version>
<Comment>Packaging update</Comment>
- <Name>Joey Riches</Name>
- <Email>josephriches@gmail.com</Email>
+ <Name>Reilly Brogan</Name>
+ <Email>solus@reillybrogan.com</Email>
</Update>
</History>
</PISI>
\ No newline at end of file

File Metadata

Mime Type
text/plain
Expires
Tue, Aug 1, 11:04 AM (1 w, 4 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5891432
Default Alt Text
D14277.diff (4 KB)

Event Timeline

Copyright © 2015-2021 Solus Project. The Solus logo is Copyright © 2016-2021 Solus Project. All Rights Reserved.