diff --git a/pulseaudio.changes b/pulseaudio.changes
index 2e28495..d9c8a28 100644
--- a/pulseaudio.changes
+++ b/pulseaudio.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jun 19 10:32:21 CEST 2018 - tiwai@suse.de
+
+- Revert the gconf module removal; plasma5-pa still requires it
+ (while paprefs git version moved to gsettings) (bsc#1092871)
+
-------------------------------------------------------------------
Thu Jun 14 13:40:52 CEST 2018 - tiwai@suse.de
diff --git a/pulseaudio.spec b/pulseaudio.spec
index d55637f..e08144d 100644
--- a/pulseaudio.spec
+++ b/pulseaudio.spec
@@ -73,7 +73,7 @@ BuildRequires: translation-update-upstream
BuildRequires: update-desktop-files
BuildRequires: pkgconfig(bash-completion)
BuildRequires: pkgconfig(dbus-1) >= 1.4.12
-BuildRequires: pkgconfig(gio-2.0) >= 2.26.0
+BuildRequires: pkgconfig(gconf-2.0)
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(ice)
@@ -213,12 +213,24 @@ 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
@@ -352,7 +364,7 @@ export CFLAGS="%{optflags} -fPIE"
--disable-bluez4 \
--enable-webrtc-aec \
--enable-adrian-aec \
- --disable-gconf \
+ --enable-gconf \
--enable-gsettings \
--with-udev-rules-dir=%{_udevrulesdir} \
--with-pulsedsp-location='%{_prefix}/\\$$LIB/pulseaudio'
@@ -606,6 +618,13 @@ 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}