[rpms/fedora-release] f45: user session: drop duplicate pipewire-pulse preset

[rpms/fedora-release] f45: user session: drop duplicate pipewire-pulse preset

[Neal Gompa]

            A new commit has been pushed.

            Repo   : rpms/fedora-release
            Branch : f45
            Commit : 5f8c4e8eeef7f422ecd3bffb1af1bfc4cc156779
            Author : Neal Gompa <ngompa@fedoraproject.org>
            Date   : 2021-07-23T05:28:24-04:00
            Stats  : +7/-7 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/fedora-release/c/5f8c4e8eeef7f422ecd3bffb1af1bfc4cc156779?branch=f45

            Log:
            user session: drop duplicate pipewire-pulse preset

We have this defined twice for no particularly good reason.
Clean this up so that we have only a single instance of the
setting.

---
diff --git a/90-default-user.preset b/90-default-user.preset
index 4fe63b8..c19d1b2 100644
--- a/90-default-user.preset
+++ b/90-default-user.preset
@@ -9,8 +9,10 @@ enable dbus-broker.service
 # https://bugzilla.redhat.com/show_bug.cgi?id=1592434
 enable pipewire.socket
 
-# Pulse-audio compatibility for pipewire
+# Enable the PipeWire PulseAudio compatibility socket interface
 # https://bugzilla.redhat.com/show_bug.cgi?id=1904239
+# https://bugzilla.redhat.com/show_bug.cgi?id=1907906
+# https://fedoraproject.org/wiki/Changes/DefaultPipeWire
 enable pipewire-pulse.socket
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=1976006
@@ -18,11 +20,6 @@ enable pipewire-media-session.service
 # https://bugzilla.redhat.com/show_bug.cgi?id=1979419
 enable wireplumber.service
 
-# Enable the PipeWire PulseAudio compatibility socket interface
-# https://bugzilla.redhat.com/show_bug.cgi?id=1907906
-# https://fedoraproject.org/wiki/Changes/DefaultPipeWire
-enable pipewire-pulse.socket
-
 # Enable the session agent for snaps
 # https://bugzilla.redhat.com/show_bug.cgi?id=1734371
 enable snapd.session-agent.socket

diff --git a/fedora-release.spec b/fedora-release.spec
index 2713500..fc6766b 100644
--- a/fedora-release.spec
+++ b/fedora-release.spec
@@ -60,7 +60,7 @@
 Summary:        Fedora release files
 Name:           fedora-release
 Version:        35
-Release:        0.11%{?eln:.eln%{eln}}
+Release:        0.12%{?eln:.eln%{eln}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -1328,6 +1328,9 @@ ln -s %{_swidtagdir} %{buildroot}%{_sysconfdir}/swid/swidtags.d/fedoraproject.or
 
 
 %changelog
+* Fri Jul 23 2021 Neal Gompa <ngompa@fedoraproject.org> - 35-0.12
+- user session: drop duplicate pipewire-pulse preset
+
 * Wed Jul 14 2021 Kevin Fenzi <kevin@scrye.com> - 35-0.11
 - user session: wireplumber.service and pipewire-pulse.socket