dbus: add provides `dbus-x11` & drop metapackage (#4021)

* dbus: add an explicit provides `dbus-x11`
* dbus-x11: drop metapackage
* toolkit: dbus-x11: remove entanglement with dbus
* dbus: add comment to build with X11 support
* dbus: license: update entry

Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>

SPECS-EXTENDED/dbus-x11/dbus-x11.spec

@@ -1,40 +0,0 @@
-Summary:        DBus for systemd
-Name:           dbus-x11
-Version:        1.15.2
-Release:        1%{?dist}
-License:        GPLv2+ OR AFL
-Vendor:         Microsoft Corporation
-Distribution:   Mariner
-Group:          Applications/File
-URL:            https://www.freedesktop.org/wiki/Software/dbus
-Requires:       dbus = %{version}
-
-%description
-This is a metapackage that requires dbus. The Fedora dbus-x11 package
-is a subpackage of dbus, containing the dbus-launch binary built in presence of
-x11 libraries. The Mariner dbus package is not built with x11 libraries, but
-does still ship the dbus-launch binary. Since packages needing dbus-x11 either
-require it for package tests or for desktop applications, we don't really
-need to concern ourselves with shipping the "proper" binary built with x11.
-
-To avoid conflicting with the Mariner dbus package, this metapackage will exist
-until the Mariner dbus package is built with x11 libraries.
-
-%prep
-
-%build
-
-%install
-
-%files
-
-%changelog
-* Wed Oct 12 2022 Henry Li <lihl@microsoft.com> - 1.15.2-1
-- Update version to match with dbus version
-
-* Tue Mar 15 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.14.0-1
-- Updating version to be in-sync with "dbus".
-
-* Tue Jun 01 2021 Thomas Crain <thcrain@microsoft.com> - 1.13.6-1
-- Original version for CBL-Mariner
-- License verified

SPECS/LICENSES-AND-NOTICES/data/licenses.json

@@ -1979,7 +1979,6 @@
                 "coredns-1.8.4",
                 "coredns-1.8.6",
                 "csi-driver-lvm",
-                "dbus-x11",
                 "dcos-cli",
                 "debugedit",
                 "dejavu-fonts",

SPECS/dbus/dbus.spec

@@ -2,7 +2,7 @@
 Summary:        DBus for systemd
 Name:           dbus
 Version:        1.15.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2+ OR AFL
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -21,6 +21,10 @@ Requires:       xz
 Recommends:     systemd
 Provides:       dbus-libs = %{version}-%{release}
 
+# NOTE: We currently do not build with X11 support.
+# build with X11 support in the future.
+Provides:       %{name}-x11
+
 %description
 The dbus package contains dbus.
 
@@ -82,6 +86,9 @@ make %{?_smp_mflags} check
 %{_libdir}/*.so
 
 %changelog
+* Fri Oct 14 2022 Muhammad Falak <mwani@microsoft.com> - 1.15.2-2
+- Add an explicit provides `dbus-x11`
+
 * Wed Oct 12 2022 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 1.15.2-1
 - Upgrade to 1.15.2
 

toolkit/scripts/check_entangled_specs.py

@@ -37,10 +37,6 @@ version_matching_groups = [
         "SPECS/hyperv-daemons/hyperv-daemons.spec",
         "SPECS/kernel/kernel.spec"
     ]),
-    frozenset([
-        "SPECS/dbus/dbus.spec",
-        "SPECS-EXTENDED/dbus-x11/dbus-x11.spec"
-    ]),
     frozenset([
         "SPECS/python-flit/python-flit.spec",
         "SPECS/python-flit-core/python-flit-core.spec"