From 094c0b7a0bcb08ec56741540710fb9e80d5690f5 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@gmail.com>
Date: May 13 2018 13:50:13 +0000
Subject: 11.99.1 (#1577603)

new pulseaudio-module-gsettings subpkg

TODO: explore when/how best to deprecate/remove -module-gconf (in favor of -gsettings)

---

diff --git a/pulseaudio.spec b/pulseaudio.spec
index a7bf4b7..b2e1a62 100644
--- a/pulseaudio.spec
+++ b/pulseaudio.spec
@@ -1,10 +1,10 @@
-%global pa_major   11.1
-#global pa_minor   0
+%global pa_major   11.99
+%global pa_minor   1
 
-%global snap       20180411
-%global gitrel     129
-%global gitcommit  ba2b748d40f78b9d9f945b5422ca74d05f8d0d07
-%global shortcommit %(c=%{gitcommit}; echo ${c:0:5})
+#global snap       20180411
+#global gitrel     129
+#global gitcommit  ba2b748d40f78b9d9f945b5422ca74d05f8d0d07
+#global shortcommit %(c=%{gitcommit}; echo ${c:0:5})
 
 # webrtc bits go wonky without this
 # see also https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/JQQ66XJSIT2FGTK2YQY7AXMEH5IXMPUX/
@@ -39,7 +39,7 @@
 Name:           pulseaudio
 Summary:        Improved Linux Sound Server
 Version:        %{pa_major}%{?pa_minor:.%{pa_minor}}
-Release:        21%{?snap:.%{snap}git%{shortcommit}}%{?dist}
+Release:        1%{?snap:.%{snap}git%{shortcommit}}%{?dist}
 License:        LGPLv2+
 URL:            http://www.freedesktop.org/wiki/Software/PulseAudio
 %if 0%{?gitrel}
@@ -214,10 +214,15 @@ JACK sink and source modules for the PulseAudio sound server.
 %package module-gconf
 Summary:        GConf support for the PulseAudio sound server
 Requires:       %{name}%{?_isa} = %{version}-%{release}
-
 %description module-gconf
 GConf configuration backend for the PulseAudio sound server.
 
+%package module-gsettings
+Summary:        Gsettings support for the PulseAudio sound server
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+%description module-gsettings
+GSettings configuration backend for the PulseAudio sound server.
+
 %package libs
 Summary:        Libraries for PulseAudio clients
 License:        LGPLv2+
@@ -275,7 +280,9 @@ This package contains GDM integration hooks for the PulseAudio sound server.
 
 ## upstreamable patches
 # experimental, rawhide only
-%if 0%{?fedora} > 28
+#if 0%{?fedora} > 28
+## no longer applies cleanly, rebase or drop -- rex
+%if 0
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1
@@ -321,6 +328,8 @@ NOCONFIGURE=1 ./bootstrap.sh
   %{?tcpwrap:--enable-tcpwrap}%{!?tcpwrap:--disable-tcpwrap} \
   --disable-bluez4 \
   --enable-bluez5 \
+  --enable-gconf \
+  --enable-gsettings \
 %ifarch %{arm}
   --disable-neon-opt \
 %endif
@@ -601,8 +610,13 @@ exit 0
 %{_libdir}/pulse-%{pa_major}/modules/module-gconf.so
 %{_libexecdir}/pulse/gconf-helper
 
-%post libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
+%files module-gsettings
+%{_libdir}/pulse-%{pa_major}/modules/module-gsettings.so
+%{_libexecdir}/pulse/gsettings-helper
+%{_datadir}/GConf/gsettings/pulseaudio.convert
+%{_datadir}/glib-2.0/schemas/org.freedesktop.pulseaudio.gschema.xml
+
+%ldconfig_scriptlets libs
 
 %files libs -f %{name}.lang
 %doc README LICENSE GPL LGPL
@@ -614,8 +628,7 @@ exit 0
 %{_libdir}/pulseaudio/libpulsecommon-%{pa_major}.so
 %{_libdir}/pulseaudio/libpulsedsp.so
 
-%post libs-glib2 -p /sbin/ldconfig
-%postun libs-glib2 -p /sbin/ldconfig
+%ldconfig_scriptlets libs-glib2
 
 %files libs-glib2
 %{_libdir}/libpulse-mainloop-glib.so.0*
@@ -672,6 +685,11 @@ exit 0
 
 
 %changelog
+* Sun May 13 2018 Rex Dieter <rdieter@fedoraproject.org> - 11.99.1-1
+- 11.99.1 (#1577603)
+- use %%ldconfig_scriptlets
+- new pulseaudio--module-gsettings subpkg
+
 * Tue May 08 2018 Rex Dieter <rdieter@fedoraproject.org> - 11.1-21
 - drop unused getaffinity,memfd patches
 - include experimental bluetooth patches only on rawhide
diff --git a/sources b/sources
index 2bc98d7..088b772 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
-SHA512 (pulseaudio-11.1-129-gba2b7.tar.xz) = 2395e30fd939ce45a95c6466c44deb2c0e76b309640b70f094d6ada63c650386f6c43d655bf4f3b2704b6ce6faa3567a9900f07beb3588f408de28ad29e961bf
+SHA512 (pulseaudio-11.99.1.tar.xz) = f9340f836bd12756ddb30e27bb04f8470a97ec372f5d9a2703da3ac348436b7b3efe074635c5a994cc6cd77c7f18aa2d74811c7e12bc52c0578fd15f8dffaab8
+SHA512 (pulseaudio-11.99.1.tar.xz.md5) = 1c783a592445c4679015ee290bea0c01f2fc2c9c26e396b1d7110729d209670df1cd677de05dbb1c274267a51ba55fa8d3e7e8964a31e8cfd466b16b0c805fa0
+SHA512 (pulseaudio-11.99.1.tar.xz.sha1) = f26f58bfaf4713f3a650f36f01a4a35140e29ec5371db2442cf642b47fa44963c39bf55be916babd56ebb781eeac7f80f1b294d2816e53602653f2bb18fdddd7