Silence macro-in-comment

Fallout from 5d01674e18 [skip changelog]
Convert to %autorelease and %autochangelog
2025-11-07 15:59:00 +01:00 · 2025-11-07 15:57:57 +01:00 · 2025-07-23 19:03:06 +00:00 · 2025-01-16 15:17:31 +00:00 · 2025-01-03 16:03:57 -05:00 · 2024-12-17 12:09:37 +00:00
12 changed files with 1463 additions and 1093 deletions
--- a/.gitignore
+++ b/.gitignore
@ -39,3 +39,36 @@
 /dbus-1.11.22.tar.gz
 /dbus-1.12.0.tar.gz
 /dbus-1.12.8.tar.gz
+/dbus-1.12.10.tar.gz
+/dbus-1.12.12.tar.gz
+/dbus-1.12.14.tar.gz
+/dbus-1.12.16.tar.gz
+/dbus-1.12.16.tar.gz.asc
+/dbus-1.12.18.tar.gz
+/dbus-1.12.18.tar.gz.asc
+/dbus-1.12.20.tar.gz
+/dbus-1.12.20.tar.gz.asc
+/dbus-1.13.18.tar.xz
+/dbus-1.13.18.tar.xz.asc
+/dbus-1.13.20.tar.xz
+/dbus-1.13.20.tar.xz.asc
+/dbus-1.13.22.tar.xz
+/dbus-1.13.22.tar.xz.asc
+/dbus-1.14.0.tar.xz
+/dbus-1.14.0.tar.xz.asc
+/dbus-1.14.2.tar.xz
+/dbus-1.14.2.tar.xz.asc
+/dbus-1.14.4.tar.xz
+/dbus-1.14.4.tar.xz.asc
+/dbus-1.14.6.tar.xz
+/dbus-1.14.6.tar.xz.asc
+/dbus-1.14.8.tar.xz
+/dbus-1.14.8.tar.xz.asc
+/dbus-1.14.10.tar.xz
+/dbus-1.14.10.tar.xz.asc
+/dbus-1.15.2.tar.xz
+/dbus-1.15.2.tar.xz.asc
+/dbus-1.15.8.tar.xz
+/dbus-1.15.8.tar.xz.asc
+/dbus-1.16.0.tar.xz
+/dbus-1.16.0.tar.xz.asc
--- a/.mailmap
+++ b/.mailmap
@ -0,0 +1 @@
+<rishi@fedoraproject.org> <debarshir@gnome.org>
--- a/0001-tools-Use-Python3-for-GetAllMatchRules.patch
+++ b/0001-tools-Use-Python3-for-GetAllMatchRules.patch
@ -0,0 +1,22 @@
+From 59ddde9e1ed5de03b060ff3ce27e35509707dff2 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters@verbum.org>
+Date: Tue, 31 Jul 2018 12:33:59 -0400
+Subject: [PATCH] tools: Use Python3 for GetAllMatchRules
+
+---
+ tools/GetAllMatchRules.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/GetAllMatchRules.py b/tools/GetAllMatchRules.py
+index 6a7e4cd9..f7e340d6 100755
+--- a/tools/GetAllMatchRules.py
+++ b/tools/GetAllMatchRules.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
+#!/usr/bin/python3
+ 
+ import sys
+ import argparse
+-- 
+2.17.1
+
--- a/1164
+++ b/1164
--- a/dbus-daemon.service
+++ b/dbus-daemon.service
@ -0,0 +1,15 @@
+[Unit]
+Description=D-Bus System Message Bus
+Documentation=man:dbus-daemon(1)
+Requires=dbus.socket
+
+[Service]
+ExecStart=/usr/bin/dbus-daemon --system --address=systemd: --nofork --nopidfile --systemd-activation --syslog-only
+ExecReload=/usr/bin/dbus-send --print-reply --system --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig
+OOMScoreAdjust=-900
+
+[Install]
+# Make sure that services can still refer to this under the name of the
+# old SysV script (messagebus).
+Alias=dbus.service messagebus.service
+WantedBy=multi-user.target
--- a/dbus-daemon.user.service
+++ b/dbus-daemon.user.service
@ -0,0 +1,11 @@
+[Unit]
+Description=D-Bus User Message Bus
+Documentation=man:dbus-daemon(1)
+Requires=dbus.socket
+
+[Service]
+ExecStart=/usr/bin/dbus-daemon --session --address=systemd: --nofork --nopidfile --systemd-activation --syslog-only
+ExecReload=/usr/bin/dbus-send --print-reply --session --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig
+
+[Install]
+Alias=dbus.service
--- a/dbus-systemd-sysusers.conf
+++ b/dbus-systemd-sysusers.conf
@ -0,0 +1,2 @@
+#Type  Name  ID  GECOS                 Home directory  Shell
+u      dbus  81  "System Message Bus"  -               -
--- a/dbus.socket
+++ b/dbus.socket
@ -0,0 +1,8 @@
+[Unit]
+Description=D-Bus System Message Bus Socket
+
+[Socket]
+ListenStream=/run/dbus/system_bus_socket
+
+[Install]
+WantedBy=sockets.target
--- a/dbus.spec
+++ b/dbus.spec
--- a/dbus.user.socket
+++ b/dbus.user.socket
@ -0,0 +1,9 @@
+[Unit]
+Description=D-Bus User Message Bus Socket
+
+[Socket]
+ListenStream=%t/bus
+ExecStartPost=-/usr/bin/systemctl --user set-environment DBUS_SESSION_BUS_ADDRESS=unix:path=%t/bus
+
+[Install]
+WantedBy=sockets.target
--- a/gpgkey-DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90.gpg
+++ b/gpgkey-DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90.gpg
--- a/3
+++ b/3
@ -1 +1,2 @@
-SHA512 (dbus-1.12.8.tar.gz) = 8177898bf2db22e5c6abff0d9ffec8f248f0d155a83b7ae906c1ce3b61d289e7ba7bef9799102e6de3ca64198c7d293dccecf92c7e8b7403c1d9b1bb86e99ea3
+SHA512 (dbus-1.16.0.tar.xz) = 9206bf4e41575f379e4c615212d137600967311f3c8feac94692aadf4dca9df9169ae52c404ec8ed31a9b2bc718792be920ac0130f1159f082e4b6c66f3f233e
+SHA512 (dbus-1.16.0.tar.xz.asc) = 92f4895cf02637b75f9dc481f6001bc5335ab0354cda6553536238a20333286a7dcebd516118c880da5fddc06a30c296ac0cd6edc56dd4059671d16b864227ee
Author	SHA1	Message	Date
Debarshi Ray	05e5c6d1c9	Silence macro-in-comment Fallout from `5d01674e18` [skip changelog]	2025-11-07 15:59:00 +01:00
Debarshi Ray	0c5ef210bd	Convert to %autorelease and %autochangelog ... using 'rpmautospec convert'. Differences in email addresses between Git commits and RPM %changelog were resolved in favour of the latter. [skip changelog]	2025-11-07 15:57:57 +01:00
Fedora Release Engineering	d7ee147567	Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild	2025-07-23 19:03:06 +00:00
Fedora Release Engineering	3244c5916b	Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild	2025-01-16 15:17:31 +00:00
Yaakov Selkowitz	c4ff19d719	Conditionalize dbus-broker dependency dbus-broker is a host service (with both system and user instances), and should not (and need not) be present to use DBus in flatpaks or toolboxes.	2025-01-03 16:03:57 -05:00
David King	5ad569a6c9	Update to 1.16.0 and use meson	2024-12-17 12:09:37 +00:00
David King	641325c814	Update to 1.15.8	2024-12-17 12:09:37 +00:00
Marc-André Lureau	d5095b5d89	Update to 1.15.2 and meson Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>	2024-12-17 12:09:35 +00:00
Fedora Release Engineering	707f05d86c	Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild	2024-07-17 20:34:04 +00:00
Fedora Release Engineering	cb6b0216c0	Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild	2024-01-24 08:58:49 +00:00
Fedora Release Engineering	f89e791e43	Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild	2024-01-19 16:44:28 +00:00
David King	53b34d262e	Update to 1.14.10	2023-09-01 19:19:44 +01:00
Fedora Release Engineering	19968972eb	Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2023-07-19 17:01:11 +00:00
David King	f6bc5d96e7	Update to 1.14.8 Use SPDX license expression.	2023-06-06 21:08:59 +01:00
David King	f1260338ca	Update to 1.14.6	2023-02-08 18:05:50 +00:00
Fedora Release Engineering	788c9af7f8	Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2023-01-19 01:01:08 +00:00
David King	1ec0a9242b	Update to 1.14.4	2022-10-06 17:00:14 +01:00
David King	52feafa331	Update to 1.14.2	2022-09-27 08:03:56 +01:00
Debarshi Ray	da8aea9041	Restore Requires(pre) through %%sysusers_requires_compat ... to match %%sysusers_create_compat. Fallout from `f8a9185e19`	2022-08-22 20:37:10 +02:00
Luca BRUNO	316e32c369	dbus: align sysusers.d configuration to Fedora user/group allocation Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2105177	2022-08-03 12:18:18 +00:00
Fedora Release Engineering	9d36c6aeb4	Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2022-07-21 00:04:42 +00:00
David King	f8a9185e19	Use sysusers.d snippet for user configuration (#2105177 ) As neither Debian nor openSUSE seem to use a static UID and GID, drop that at the same time and prefer dynamic IDs instead.	2022-07-12 17:50:06 +01:00
David King	065c605ad5	Update to 1.14.0	2022-03-10 09:37:30 +00:00
David King	7d50ff21d7	Update to 1.13.22	2022-02-24 08:32:18 +00:00
Fedora Release Engineering	a4dd2a6ed1	- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2022-01-20 00:18:23 +00:00
David King	a69a094b1e	Explicitly specify runstatedir (#2036943 )	2022-01-04 13:57:24 +00:00
David King	35ba0cebc0	Update to 1.13.20	2021-12-17 16:28:28 +00:00
Kalev Lember	78984513f5	Avoid systemd_requires as per updated packaging guidelines There is no need to have them as systemd correctly handles reloading depending on the transaction ordering (even if systemd is installed _after_ the package that installs the unit file). Additionally, this also drops hard requires on /usr/bin/systemctl and just makes the scriptlets that call systemctl conditional on systemctl being present. All of this helps avoid pulling in full systemd for container setups.	2021-10-01 12:33:22 +02:00
Fedora Release Engineering	ce63bf9240	- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2021-07-21 20:25:40 +00:00
Fedora Release Engineering	7fee961c56	- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2021-01-26 03:02:11 +00:00
Tom Stellard	50b52089d0	Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot	2020-12-19 05:32:14 +00:00
Fedora Release Engineering	b48caa7af0	- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2020-07-27 15:03:16 +00:00
David King	a7a918f4b1	Update to 1.12.20	2020-07-02 20:54:28 +01:00
David King	b5d6ebb285	Update to 1.12.18	2020-06-02 21:36:26 +01:00
David King	91491679c5	Improve permissions on ghosted /run/dbus	2020-02-25 08:36:30 +00:00
David King	e75175d9b4	Verify GPG signature of sources https://docs.fedoraproject.org/en-US/packaging-guidelines/#_source_file_verification	2020-02-25 08:08:29 +00:00
David King	dafecf5b80	Update python2- to python3-gobject	2020-01-31 10:58:35 +00:00
Fedora Release Engineering	628c608e41	- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2020-01-28 15:24:29 +00:00
David King	48e0f0c159	Ensure that patches are applied	2019-08-01 07:24:35 +01:00
Fedora Release Engineering	23b406f320	- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2019-07-24 21:35:25 +00:00
David King	83ae3fd808	Update to 1.12.16	2019-06-11 19:00:28 +01:00
David King	92826827bd	Update to 1.12.14	2019-05-17 16:20:37 +01:00
David King	e614b5e96b	Improve user and group creation (#1698001 )	2019-04-09 16:07:41 +01:00
David King	99352d1e4a	Own system.d and session.d directories (#1696385 )	2019-04-04 22:12:53 +01:00
Leigh Scott	cb1110c026	Fix f30 FTBFS	2019-03-03 11:52:41 +00:00
Kalev Lember	39280f37dc	Update requires for pygobject3 -> python2-gobject rename This also makes it explicit that the BRs are still using a python2 package as it's not immediately obvious that pygobject3 is the python2 build.	2019-02-04 09:44:18 +01:00
Fedora Release Engineering	d6293444a6	- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2019-01-31 16:50:34 +00:00
Igor Gnatenko	f8751d6244	Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag	2019-01-28 20:23:58 +01:00
David King	03307dd79d	Change -devel subpackage to depend on -libs	2018-12-14 23:03:31 +00:00
David King	dbe2752d95	Update to 1.12.12	2018-12-04 21:38:38 +00:00
David Herrmann	6ca2d754db	Switch to dbus-broker as default backend Make the 'dbus' package pull in 'dbus-broker' over 'dbus-daemon' as the default implementation. Note that dbus-broker-16-2 is needed, since this has the required hooks to switch over the systemd units. Signed-off-by: David Herrmann <dh.herrmann@gmail.com>	2018-11-22 10:46:14 +00:00
Stephen Gallagher	bca95f22ec	Fix requirement on system-release The addition of `Requires: fedora-release` broke all installations using the non-branded `generic-release` package. This should not be a requirement, but a conflict against versions older than those which added the preset. Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>	2018-11-07 10:43:51 -05:00
Tom Gundersen	4873c189a2	Fix messagebus alias	2018-11-06 17:43:55 +01:00
David King	cc2d235361	Add further Requires to subpackages Add fedora-release to daemon subpackage, as the systemctl preset calls in the triggerpostun require it. Add systemd_requires macro to daemon subpackage, as it (like the common subpackage) calls systemctl in triggerpostun.	2018-11-05 15:13:18 +00:00
Tom Gundersen	09cb4f85bc	Add missing requires to 'common' and 'daemon' subpackage Both subpackages call various %systemd scriptlets, so they need the %systmd_requires macro. Their %triggerpostun also call systemctl directly, so add an explicit Requires on that. Some of this may in practice prove redundant, but let's be explicit and hopefully more robust. Signed-off-by: Tom Gundersen <teg@jklm.no>	2018-11-05 14:46:51 +01:00
David Herrmann	5a8f8e63cb	Move 'useradd' dependency to daemon subpackage The 'useradd' invocation is now on the 'daemon' subpackage, so move the useradd dependency as well. Signed-off-by: David Herrmann <dh.herrmann@gmail.com>	2018-10-24 08:08:44 +01:00
David King	f312051bb4	Remove unnecessary ldconfig calls https://fedoraproject.org/wiki/Changes/Removing_ldconfig_scriptlets	2018-10-19 09:16:25 +01:00
David King	f087b7cb37	Move systemd to Requires of common subpackage (#1638910 )	2018-10-19 09:16:03 +01:00
David King	dbd50d1961	Move user and group creation to daemon subpackage	2018-10-19 07:53:56 +01:00
Tom Gundersen	4372ca36ca	dbus: apply presets on update The systemd RPM macros only apply presets on first install, we need to also apply them on the initial upgrade that starts depending on them. Signed-off-by: Tom Gundersen <teg@jklm.no> Signed-off-by: David Herrmann <dh.herrmann@gmail.com>	2018-08-31 16:38:09 +02:00
David Herrmann	27eb7993d2	dbus: change 'system-release' dependency to 'fedora-release' As it turns out, 'fedora-release' only has: 'Provides: system-release' rather than: 'Provides: system-release = %{version}-%{release}' This means, any explicit dependencies on 'system-release' ignore versioning completely. This is unfortunate, and breaks our reliance on 'system-release'. Fortunately, unlike recommended on the wiki, it is safe to depend on 'fedora-release' explicitly. Other fedora flavors have this package as well, so there is no reason not to. Signed-off-by: David Herrmann <dh.herrmann@gmail.com>	2018-08-31 16:37:38 +02:00
David Herrmann	235a81bfa5	dbus: move systemd-hooks for dbus.socket to 'dbus-common' The systemd_{post,postun,preun,..} hooks should be called in the package that actually provides the given files. There is no harm in calling these in the dbus-daemon package, but preferably we don't. Move this to 'dbus-common' for dbus.socket, since dbus.socket is provided by it. This makes sure the unit is properly enabled/disabled even without the dbus-daemon package installed. Note that it is safe to enable/disable dbus.socket even without a dbus.service around. systemd can deal with this just fine, and only ever actually pulls in the socket if an activatable service is around. Signed-off-by: David Herrmann <dh.herrmann@gmail.com>	2018-08-30 12:03:25 +02:00
David Herrmann	b8679ce6a8	dbus: move generic units into 'dbus-common' Make sure the generic unit files are provided by 'dbus-common', so alternative dbus implementations can use them as well. Signed-off-by: David Herrmann <dh.herrmann@gmail.com>	2018-08-29 11:44:38 +02:00
David Herrmann	896fb4a918	dbus: make use of [Install] unit sections Rather than installing symlinks during the installation manually, put in [Install] sections into the units. This has the same effect, but allows changing the installation conditions via systemd-presets, which are provided by the 'fedora-release' package. Signed-off-by: David Herrmann <dh.herrmann@gmail.com>	2018-08-29 11:44:36 +02:00
David Herrmann	2fe9ed5df9	dbus: provide custom units Rather than using the upstream units, use custom units tailored for Fedora. For now, we mirror what upstream does, but rename the service to 'dbus-daemon.service', with an alias on 'dbus.service'. Follow-up patches will then introduce some changes to the units for better integration of alternative D-Bus implementations. Signed-off-by: David Herrmann <dh.herrmann@gmail.com>	2018-08-29 11:42:43 +02:00
David King	b4e92b3dec	Update to 1.12.10	2018-08-03 07:05:51 +01:00
Colin Walters	9afcd0abee	Add patch to port example to python3	2018-07-31 16:43:42 +00:00
Colin Walters	5f4342f1b7	Use python3-dbus to drop python2 deps	2018-07-31 16:19:09 +00:00
Colin Walters	180ea84df0	build: Use python3-dbus As part of the super exciting and rewarding port to Python 3.	2018-07-31 16:08:54 +00:00
Fedora Release Engineering	2046326cce	- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2018-07-12 22:36:54 +00:00
David Herrmann	a2190325da	dbus: extract 'dbus-tools' from 'dbus-daemon' Create a new sub-package called 'dbus-tools', which includes all the independent command-line utilities provided by the reference implementation. They are valid to be used with independent bus implementations, so no reason to make them pull in dbus-daemon. Signed-off-by: David Herrmann <dh.herrmann@gmail.com>	2018-05-23 10:06:52 +02:00
David Herrmann	b3696e58df	dbus: extract 'dbus-common' sub-package Create a new sub-package called 'dbus-common', extracting the XML configuration and setup files from 'dbus-daemon'. These files might be used by alternative D-Bus Messages Bus implementations, hence we want them as a separate package. This also pulls in the 'dbus' sysuser.d setup file, since this uid is referenced from the xml-configuration of the system bus. Hence, it is part of the configuration and required to be used by any compatible implementation using the official XML configurations. Signed-off-by: David Herrmann <dh.herrmann@gmail.com>	2018-05-23 10:06:18 +02:00
David Herrmann	1adc79b70a	dbus: extract 'dbus' package into 'dbus-daemon' This extracts all the contents of the 'dbus' package into a new 'dbus-daemon' package. All internal sub-package dependencies are updated to point to the new sub-package. The original 'dbus' package is kept around as empty meta-package that simply pulls in 'dbus-daemon'. This is meant for compatibility so other packages continue working for now. Dependencies on 'dbus' will be reviewed and updated before this meta-package gets removed. This package rename prepares Fedora to allow alternative implementations of D-Bus System and Session buses. The 'dbus' package name is freed from dependencies on any particular implementation. Instead, the reference implementation is now called 'dbus-daemon' as a package, with the intent to re-use the 'dbus' package name in the future as a meta-name provided by 'dbus-daemon' as well alternative implementations like 'dbus-broker'. It will serve as dependency of dbus-only services to clearly tell rpm that a dbus system or user bus implementation is required for a given package. Signed-off-by: David Herrmann <dh.herrmann@gmail.com>	2018-05-23 10:05:28 +02:00
David King	8655952f6f	Update to 1.12.8 (#1556590 )	2018-04-30 18:51:27 +01:00
Adam Jackson	0493b27318	Don't Require: xorg-x11-xinit. We don't actually need it, and newer filesystem packages own the directory for us.	2018-02-20 12:28:42 -05:00
Fedora Release Engineering	26b7e3336a	- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2018-02-07 06:24:15 +00:00
				`@ -0,0 +1 @@`
				`<rishi@fedoraproject.org> <debarshir@gnome.org>`