From 761a72083e6618f52d98373fa4c818d325db555249f873959649d7a6640b7e94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Fri, 8 Jun 2018 11:41:54 +0000
Subject: [PATCH] Accepting request 614873 from
 home:iznogood:branches:multimedia:libs

- Drop pkgconfig(gconf-2.0) BuildRequires: No longer mandatory,
  following this, replace --enable-gconf configure call with
  --disable-gconf and add explicit pkgconfig(gio-2.0)
  BuildRequires.
- Following the above, drop pulseaudio-module-gconf sub-package,
  and obsolete it from pulseaudio-module-gsettings.

OBS-URL: https://build.opensuse.org/request/show/614873
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/pulseaudio?expand=0&rev=190
---
 pulseaudio.changes | 10 ++++++++++
 pulseaudio.spec    | 25 +++----------------------
 2 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/pulseaudio.changes b/pulseaudio.changes
index 7dc1b0e..c046ce9 100644
--- a/pulseaudio.changes
+++ b/pulseaudio.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Jun  6 21:27:06 UTC 2018 - bjorn.lie@gmail.com
+
+- Drop pkgconfig(gconf-2.0) BuildRequires: No longer mandatory,
+  following this, replace --enable-gconf configure call with
+  --disable-gconf and add explicit pkgconfig(gio-2.0)
+  BuildRequires.
+- Following the above, drop pulseaudio-module-gconf sub-package,
+  and obsolete it from pulseaudio-module-gsettings.
+
 -------------------------------------------------------------------
 Tue May 15 12:27:13 UTC 2018 - oholecek@suse.com
 
diff --git a/pulseaudio.spec b/pulseaudio.spec
index 9d21522..3cd7312 100644
--- a/pulseaudio.spec
+++ b/pulseaudio.spec
@@ -72,7 +72,7 @@ BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(bash-completion)
 BuildRequires:  pkgconfig(dbus-1) >= 1.4.12
-BuildRequires:  pkgconfig(gconf-2.0)
+BuildRequires:  pkgconfig(gio-2.0) >= 2.26.0
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(ice)
@@ -212,24 +212,12 @@ improved drop-in replacement for the Enlightened Sound Daemon (ESOUND).
 
 Contains Bluetooth audio (A2DP/HSP/HFP) support for the PulseAudio sound server.
 
-%package module-gconf
-Summary:        GCONF module for PulseAudio
-Group:          System/Sound Daemons
-Requires:       %{name} = %{version}
-Conflicts:      %{name}-module-gsettings
-
-%description module-gconf
-pulseaudio is a networked sound server for Linux and other Unix like
-operating systems and Microsoft Windows. It is intended to be an
-improved drop-in replacement for the Enlightened Sound Daemon (ESOUND).
-
-This package provides gconf storage of PulseAudio sound server settings.
-
 %package module-gsettings
 Summary:        GSettings module for PulseAudio
 Group:          System/Sound Daemons
 Requires:       %{name} = %{version}
 Conflicts:      %{name}-module-gconf
+Obsoletes:      %{name}-module-gconf
 
 %description module-gsettings
 pulseaudio is a networked sound server for Linux and other Unix like
@@ -362,7 +350,7 @@ export CFLAGS="%{optflags} -fPIE"
         --disable-bluez4 \
         --enable-webrtc-aec \
         --enable-adrian-aec \
-        --enable-gconf \
+        --disable-gconf \
         --enable-gsettings \
         --with-udev-rules-dir=%{_udevrulesdir} \
         --with-pulsedsp-location='%{_prefix}/\\$$LIB/pulseaudio'
@@ -616,13 +604,6 @@ exit 0
 %{_libdir}/pulse-%{drvver}/modules/module-bluez5-device.so
 %{_libdir}/pulse-%{drvver}/modules/module-bluez5-discover.so
 
-%files module-gconf
-%dir %{_libexecdir}/pulse
-%dir %{_libdir}/pulse-%{drvver}
-%dir %{_libdir}/pulse-%{drvver}/modules
-%{_libdir}/pulse-%{drvver}/modules/module-gconf.so
-%{_libexecdir}/pulse/gconf-helper
-
 %files module-gsettings
 %dir %{_libexecdir}/pulse
 %dir %{_libdir}/pulse-%{drvver}