From c6f9967666fb68cd218069a9edc7d351fc91eb0f Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Thu, 13 Nov 2008 15:33:08 +0000
Subject: [PATCH 001/102] Rebuild

---
 libcanberra.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index ac17b4a..4c98a58 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.10
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz
@@ -114,6 +114,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libcanberra.pc
 
 %changelog
+* Thu Nov 13 2008 Matthias Clasen <mclasen@redhat.com> 0.10-3
+- Rebuild
+
 * Fri Oct 10 2008 Lennart Poettering <lpoetter@redhat.com> 0.10.2
 - Drop libcanberra-gtk-module.sh since the gconf stuff is supported just fine in current gnome-session already.
 

From 01e3253ec0552929122a1d6a7602ee45547b5078 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@fedoraproject.org>
Date: Sun, 14 Dec 2008 21:41:01 +0000
Subject: [PATCH 002/102] Moved login sound to Application startup phase.

---
 ...n-Application-phase-of-gnome-session.patch | 30 +++++++++++++++++++
 libcanberra.spec                              |  9 ++++--
 2 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 0001-Run-lc-l-s-in-Application-phase-of-gnome-session.patch

diff --git a/0001-Run-lc-l-s-in-Application-phase-of-gnome-session.patch b/0001-Run-lc-l-s-in-Application-phase-of-gnome-session.patch
new file mode 100644
index 0000000..86db54a
--- /dev/null
+++ b/0001-Run-lc-l-s-in-Application-phase-of-gnome-session.patch
@@ -0,0 +1,30 @@
+From 5081594cb8cbb69fc282260388b2bb0164ce31dd Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Sun, 14 Dec 2008 22:04:01 +0100
+Subject: [PATCH] Run lc-l-s in "Application" phase of gnome-session
+
+There is no need to make g-s wait for this lc-l-s when it plays the
+welcome tune. Hence move it to "Application" phase instead of "Desktop"
+phase.
+
+This is a result of a discussion with Behdad Esfahbod to optimize the
+login time.
+---
+ src/libcanberra-login-sound.desktop.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/libcanberra-login-sound.desktop.in b/src/libcanberra-login-sound.desktop.in
+index 5b4cf7f..9fcf357 100644
+--- a/src/libcanberra-login-sound.desktop.in
++++ b/src/libcanberra-login-sound.desktop.in
+@@ -4,6 +4,6 @@ Name=GNOME Login Sound
+ Exec=@bindir@/canberra-gtk-play --id="desktop-login" --description="GNOME Login"
+ OnlyShowIn=GNOME;
+ AutostartCondition=GNOME /desktop/gnome/sound/event_sounds
+-X-GNOME-Autostart-Phase=Desktop
++X-GNOME-Autostart-Phase=Application
+ X-GNOME-Provides=login-sound
+ X-GNOME-Autostart-Notify=true
+-- 
+1.6.0.5
+
diff --git a/libcanberra.spec b/libcanberra.spec
index 4c98a58..8f8f481 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.10
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz
@@ -18,6 +18,7 @@ BuildRequires: libtdb-devel
 BuildRequires: GConf2-devel
 Requires: sound-theme-freedesktop
 Requires: pulseaudio-libs >= 0.9.11-1
+Patch1: 0001-Run-lc-l-s-in-Application-phase-of-gnome-session.patch
 
 %description
 A small and lightweight implementation of the XDG Sound Theme Specification
@@ -68,6 +69,7 @@ fi
 
 %prep
 %setup -q
+%patch1 -p1 -b .0001-Run-lc-l-s-in-Application-phase-of-gnome-session
 
 %build
 %configure --disable-static --disable-rpath --enable-pulse --enable-alsa --enable-null --with-builtin=dso
@@ -114,10 +116,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libcanberra.pc
 
 %changelog
+* Sun Dec 14 2008 Lennart Poettering <lpoetter@redhat.com> 0.10-4
+- Moved login sound to "Application" startup phase.
+
 * Thu Nov 13 2008 Matthias Clasen <mclasen@redhat.com> 0.10-3
 - Rebuild
 
-* Fri Oct 10 2008 Lennart Poettering <lpoetter@redhat.com> 0.10.2
+* Fri Oct 10 2008 Lennart Poettering <lpoetter@redhat.com> 0.10-2
 - Drop libcanberra-gtk-module.sh since the gconf stuff is supported just fine in current gnome-session already.
 
 * Mon Oct 6 2008 Lennart Poettering <lpoetter@redhat.com> 0.10-1

From 626caf6561beb6b730bd6c75093c0ba135ef57cb Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@fedoraproject.org>
Date: Wed, 21 Jan 2009 21:25:47 +0000
Subject: [PATCH 003/102] new release

---
 .cvsignore                                    |  2 +-
 ...n-Application-phase-of-gnome-session.patch | 30 -------------------
 libcanberra.spec                              | 23 +++++++-------
 sources                                       |  2 +-
 4 files changed, 14 insertions(+), 43 deletions(-)
 delete mode 100644 0001-Run-lc-l-s-in-Application-phase-of-gnome-session.patch

diff --git a/.cvsignore b/.cvsignore
index 4d379bc..d98ffa2 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libcanberra-0.10.tar.gz
+libcanberra-0.11.tar.gz
diff --git a/0001-Run-lc-l-s-in-Application-phase-of-gnome-session.patch b/0001-Run-lc-l-s-in-Application-phase-of-gnome-session.patch
deleted file mode 100644
index 86db54a..0000000
--- a/0001-Run-lc-l-s-in-Application-phase-of-gnome-session.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 5081594cb8cbb69fc282260388b2bb0164ce31dd Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Sun, 14 Dec 2008 22:04:01 +0100
-Subject: [PATCH] Run lc-l-s in "Application" phase of gnome-session
-
-There is no need to make g-s wait for this lc-l-s when it plays the
-welcome tune. Hence move it to "Application" phase instead of "Desktop"
-phase.
-
-This is a result of a discussion with Behdad Esfahbod to optimize the
-login time.
----
- src/libcanberra-login-sound.desktop.in |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/libcanberra-login-sound.desktop.in b/src/libcanberra-login-sound.desktop.in
-index 5b4cf7f..9fcf357 100644
---- a/src/libcanberra-login-sound.desktop.in
-+++ b/src/libcanberra-login-sound.desktop.in
-@@ -4,6 +4,6 @@ Name=GNOME Login Sound
- Exec=@bindir@/canberra-gtk-play --id="desktop-login" --description="GNOME Login"
- OnlyShowIn=GNOME;
- AutostartCondition=GNOME /desktop/gnome/sound/event_sounds
--X-GNOME-Autostart-Phase=Desktop
-+X-GNOME-Autostart-Phase=Application
- X-GNOME-Provides=login-sound
- X-GNOME-Autostart-Notify=true
--- 
-1.6.0.5
-
diff --git a/libcanberra.spec b/libcanberra.spec
index 8f8f481..ae5afc9 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
-Version: 0.10
-Release: 4%{?dist}
+Version: 0.11
+Release: 5%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz
@@ -18,7 +18,6 @@ BuildRequires: libtdb-devel
 BuildRequires: GConf2-devel
 Requires: sound-theme-freedesktop
 Requires: pulseaudio-libs >= 0.9.11-1
-Patch1: 0001-Run-lc-l-s-in-Application-phase-of-gnome-session.patch
 
 %description
 A small and lightweight implementation of the XDG Sound Theme Specification
@@ -69,7 +68,6 @@ fi
 
 %prep
 %setup -q
-%patch1 -p1 -b .0001-Run-lc-l-s-in-Application-phase-of-gnome-session
 
 %build
 %configure --disable-static --disable-rpath --enable-pulse --enable-alsa --enable-null --with-builtin=dso
@@ -88,13 +86,13 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %doc README LGPL
 %{_libdir}/libcanberra.so.*
-%dir %{_libdir}/libcanberra
-%{_libdir}/libcanberra/libcanberra-alsa.so
-%{_libdir}/libcanberra/libcanberra-pulse.so
-%{_libdir}/libcanberra/libcanberra-null.so
-%{_libdir}/libcanberra/libcanberra-multi.so
-%{_libdir}/libcanberra/libcanberra-oss.so
-%{_libdir}/libcanberra/libcanberra-gstreamer.so
+%dir %{_libdir}/libcanberra-%{version}
+%{_libdir}/libcanberra-%{version}/libcanberra-alsa.so
+%{_libdir}/libcanberra-%{version}/libcanberra-pulse.so
+%{_libdir}/libcanberra-%{version}/libcanberra-null.so
+%{_libdir}/libcanberra-%{version}/libcanberra-multi.so
+%{_libdir}/libcanberra-%{version}/libcanberra-oss.so
+%{_libdir}/libcanberra-%{version}/libcanberra-gstreamer.so
 
 %files gtk2
 %defattr(-,root,root)
@@ -116,6 +114,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libcanberra.pc
 
 %changelog
+* Wed Jan 21 2009 Lennart Poettering <lpoetter@redhat.com> 0.11-1
+- New version
+
 * Sun Dec 14 2008 Lennart Poettering <lpoetter@redhat.com> 0.10-4
 - Moved login sound to "Application" startup phase.
 
diff --git a/sources b/sources
index 7ef1e13..7452afe 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2623370bfcecaeecaeb85e5ec445f340  libcanberra-0.10.tar.gz
+c661db14cb0b1fe9b6963defacc3bba6  libcanberra-0.11.tar.gz

From 85c763a57fea9de7e6baae05949049b4f77cb3dd Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@fedoraproject.org>
Date: Wed, 21 Jan 2009 21:31:41 +0000
Subject: [PATCH 004/102] i accidentaly forgot to reset the release back to 1,
 but now its already     tagged, so lets go ahaead with it

---
 libcanberra.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index ae5afc9..34d8934 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -114,7 +114,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libcanberra.pc
 
 %changelog
-* Wed Jan 21 2009 Lennart Poettering <lpoetter@redhat.com> 0.11-1
+* Wed Jan 21 2009 Lennart Poettering <lpoetter@redhat.com> 0.11-5
 - New version
 
 * Sun Dec 14 2008 Lennart Poettering <lpoetter@redhat.com> 0.10-4

From 2b021c326622e3d9f21d77eeaf5c76576d7ab40c Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Thu, 5 Feb 2009 20:25:00 +0000
Subject: [PATCH 005/102] fix up requires

---
 libcanberra.spec | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index 34d8934..3cbe3d1 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.11
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz
@@ -27,6 +27,9 @@ A small and lightweight implementation of the XDG Sound Theme Specification
 Summary: Gtk+ Bindings for libcanberra
 Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
+Requires(pre): GConf2
+Requires(preun): GConf2
+Requires(post): GConf2
 
 %description gtk2
 Gtk+ bindings for libcanberra
@@ -114,6 +117,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libcanberra.pc
 
 %changelog
+* Thu Feb  5 2009 Matthias Clasen  <mclasen@redhat.com> 0.11-6
+- Fix up Requires (#484225)
+
 * Wed Jan 21 2009 Lennart Poettering <lpoetter@redhat.com> 0.11-5
 - New version
 

From 8701a5df594170ec08007e3d8c36c1d58842956e Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@fedoraproject.org>
Date: Wed, 25 Feb 2009 02:41:27 +0000
Subject: [PATCH 006/102] Preview for 0.12

---
 libcanberra.spec | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index 3cbe3d1..537ce7b 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.11
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz
@@ -12,12 +12,13 @@ BuildRequires: alsa-lib-devel
 BuildRequires: libvorbis-devel
 BuildRequires: libtool-ltdl-devel
 BuildRequires: gtk-doc
-BuildRequires: pulseaudio-libs-devel >= 0.9.11-1
+BuildRequires: pulseaudio-libs-devel >= 0.9.15
 BuildRequires: gstreamer-devel
 BuildRequires: libtdb-devel
 BuildRequires: GConf2-devel
 Requires: sound-theme-freedesktop
-Requires: pulseaudio-libs >= 0.9.11-1
+Requires: pulseaudio-libs >= 0.9.15
+Patch0: febbf740799d85dfbdca965efa9867fd70fa2cfc.patch
 
 %description
 A small and lightweight implementation of the XDG Sound Theme Specification
@@ -71,6 +72,7 @@ fi
 
 %prep
 %setup -q
+%patch0 -p1 -b .febbf740799d85dfbdca965efa9867fd70fa2cfc
 
 %build
 %configure --disable-static --disable-rpath --enable-pulse --enable-alsa --enable-null --with-builtin=dso
@@ -117,6 +119,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libcanberra.pc
 
 %changelog
+* Wed Feb 25 2009 Lennart Poettering <lpoetter@redhat.com> 0.11-7
+- Preview for 0.12
+
 * Thu Feb  5 2009 Matthias Clasen  <mclasen@redhat.com> 0.11-6
 - Fix up Requires (#484225)
 

From ee5efd23a0a28bed71f6160504916d27101cf9b9 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@fedoraproject.org>
Date: Wed, 25 Feb 2009 02:43:06 +0000
Subject: [PATCH 007/102] add missing patch

---
 ...f740799d85dfbdca965efa9867fd70fa2cfc.patch | 317 ++++++++++++++++++
 1 file changed, 317 insertions(+)
 create mode 100644 febbf740799d85dfbdca965efa9867fd70fa2cfc.patch

diff --git a/febbf740799d85dfbdca965efa9867fd70fa2cfc.patch b/febbf740799d85dfbdca965efa9867fd70fa2cfc.patch
new file mode 100644
index 0000000..7ee9659
--- /dev/null
+++ b/febbf740799d85dfbdca965efa9867fd70fa2cfc.patch
@@ -0,0 +1,317 @@
+diff --git a/Makefile.am b/Makefile.am
+index 507a02f..8db04da 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -19,7 +19,7 @@
+ dist_doc_DATA = README
+ 
+ EXTRA_DIST = bootstrap.sh autogen.sh LGPL libcanberra.schemas
+-SUBDIRS = libltdl src gtkdoc doc
++SUBDIRS = src gtkdoc doc
+ 
+ MAINTAINERCLEANFILES = README
+ noinst_DATA = README
+@@ -51,7 +51,7 @@ ACLOCAL_AMFLAGS = -I m4
+ README:
+ 	rm -f README
+ 	$(MAKE) -C doc README
+-	cd $(srcdir) && ln -s doc/README README
++	ln -s doc/README README
+ 
+ homepage: all dist
+ 	test -d $$HOME/homepage/private
+diff --git a/bootstrap.sh b/bootstrap.sh
+index abeb4f6..29d356f 100755
+--- a/bootstrap.sh
++++ b/bootstrap.sh
+@@ -18,7 +18,7 @@
+ # License along with libcanberra. If not, see
+ # <http://www.gnu.org/licenses/>.
+ 
+-VERSION=1.9
++VERSION=1.10
+ 
+ run_versioned() {
+     local P
+@@ -42,6 +42,15 @@ run_versioned() {
+ 
+ set -ex
+ 
++# We check for this here, because if pkg-config is not found in the
++# system, it's likely that the pkg.m4 macro file is also not present,
++# which will make PKG_PROG_PKG_CONFIG be undefined and the generated
++# configure file faulty.
++if ! pkg-config --version &>/dev/null; then
++    echo "pkg-config is required to bootstrap this program" &>/dev/null
++    exit 1
++fi
++
+ if [ "x$1" = "xam" ] ; then
+     run_versioned automake "$VERSION" -a -c --foreign
+     ./config.status
+@@ -54,7 +63,7 @@ else
+ 
+     mkdir -p m4
+     gtkdocize --copy --flavour no-tmpl --docdir gtkdoc
+-    "$LIBTOOLIZE" -c --force --ltdl --recursive
++    "$LIBTOOLIZE" -c --force --recursive
+     run_versioned aclocal "$VERSION" -I m4
+     run_versioned autoconf 2.63 -Wall
+     run_versioned autoheader 2.63
+diff --git a/configure.ac b/configure.ac
+index 3f1a841..51dc305 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -21,7 +21,7 @@
+ 
+ AC_PREREQ(2.63)
+ 
+-AC_INIT([libcanberra], 0.11, [mzyvopnaoreen (at) 0pointer (dot) de])
++AC_INIT([libcanberra],[0.11],[mzyvopnaoreen (at) 0pointer (dot) de])
+ AC_CONFIG_SRCDIR([src/common.c])
+ AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_MACRO_DIR(m4)
+@@ -65,9 +65,32 @@ done
+ 
+ #### libtool stuff ####
+ LT_PREREQ(2.2)
+-LT_CONFIG_LTDL_DIR([libltdl])
+ LT_INIT([dlopen win32-dll disable-static])
+-LTDL_INIT([convenience recursive])
++
++dnl Unfortunately, even up to libtool 2.2.6a there is no way to know
++dnl exactly which version of libltdl is present in the system, so we
++dnl just assume that it's a working version as long as we have the
++dnl library and the header files.
++dnl
++dnl As an extra safety device, check for lt_dladvise_init() which is
++dnl only implemented in libtool 2.x, and refine as we go if we have
++dnl refined requirements.
++dnl
++dnl Check the header files first since the system may have a
++dnl libltdl.so for runtime, but no headers, and we want to bail out as
++dnl soon as possible.
++dnl
++dnl We don't need any special variable for this though, since the user
++dnl can give the proper place to find libltdl through the standard
++dnl variables like LDFLAGS and CPPFLAGS.
++
++AC_CHECK_HEADER([ltdl.h],
++    [AC_CHECK_LIB([ltdl], [lt_dladvise_init], [LIBLTDL=-lltdl], [LIBLTDL=])],
++    [LIBLTDL=])
++
++AS_IF([test "x$LIBLTDL" = "x"],
++    [AC_MSG_ERROR([Unable to find libltdl.])])
++AC_SUBST([LIBLTDL])
+ 
+ #### Determine build environment ####
+ 
+@@ -109,7 +132,6 @@ AC_TYPE_SIZE_T
+ AC_CHECK_TYPES(ssize_t, , [AC_DEFINE([ssize_t], [signed long],
+     [Define ssize_t if it is not done by the standard libs.])])
+ AC_TYPE_OFF_T
+-AC_TYPE_SIGNAL
+ AC_TYPE_UID_T
+ 
+ #### Check for libs ####
+@@ -158,20 +180,12 @@ AM_ICONV
+ 
+ #### pkg-config ####
+ 
+-# Check for pkg-config manually first, as if its not installed the
+-# PKG_PROG_PKG_CONFIG macro won't be defined.
+-AC_CHECK_PROG(have_pkg_config, pkg-config, yes, no)
+-
+-if test x"$have_pkg_config" = "xno"; then
+-    AC_MSG_ERROR(pkg-config is required to install this program)
+-fi
+-
+ PKG_PROG_PKG_CONFIG
+ 
+ #### ALSA support (optional) ####
+ 
+ AC_ARG_ENABLE([alsa],
+-    AC_HELP_STRING([--disable-alsa], [Disable optional ALSA support]),
++    AS_HELP_STRING([--disable-alsa], [Disable optional ALSA support]),
+         [
+             case "${enableval}" in
+                 yes) alsa=yes ;;
+@@ -203,7 +217,7 @@ AC_SUBST(ALSA_LIBS)
+ ### OSS support (optional) ###
+ 
+ AC_ARG_ENABLE([oss],
+-    AC_HELP_STRING([--disable-oss], [Disable optional OSS support]),
++    AS_HELP_STRING([--disable-oss], [Disable optional OSS support]),
+         [
+             case "${enableval}" in
+                 yes) oss=yes ;;
+@@ -233,7 +247,7 @@ fi
+ ### PulseAudio (optional) ####
+ 
+ AC_ARG_ENABLE([pulse],
+-    AC_HELP_STRING([--disable-pulse], [Disable optional PulseAudio support]),
++    AS_HELP_STRING([--disable-pulse], [Disable optional PulseAudio support]),
+         [
+             case "${enableval}" in
+                 yes) pulse=yes ;;
+@@ -274,7 +288,7 @@ AC_SUBST(PULSE_LIBS)
+ #### GStreamer support (optional) ####
+ 
+ AC_ARG_ENABLE([gstreamer],
+-    AC_HELP_STRING([--disable-gstreamer], [Disable optional GStreamer support]),
++    AS_HELP_STRING([--disable-gstreamer], [Disable optional GStreamer support]),
+         [
+             case "${enableval}" in
+                 yes) gstreamer=yes ;;
+@@ -306,7 +320,7 @@ AC_SUBST(GSTREAMER_LIBS)
+ ### Null output (optional) ####
+ 
+ AC_ARG_ENABLE([null],
+-    AC_HELP_STRING([--disable-null], [Disable optional null output]),
++    AS_HELP_STRING([--disable-null], [Disable optional null output]),
+         [
+             case "${enableval}" in
+                 yes) null=yes ;;
+@@ -326,7 +340,7 @@ fi
+ ### GTK (optional) ####
+ 
+ AC_ARG_ENABLE([gtk],
+-    AC_HELP_STRING([--disable-gtk], [Disable optional GTK+ support]),
++    AS_HELP_STRING([--disable-gtk], [Disable optional GTK+ support]),
+         [
+             case "${enableval}" in
+                 yes) gtk=yes ;;
+@@ -368,7 +382,7 @@ AM_CONDITIONAL([HAVE_GTK], [test "x$HAVE_GTK" = x1])
+ #### TDB cache support (optional) ####
+ 
+ AC_ARG_ENABLE([tdb],
+-    AC_HELP_STRING([--disable-tdb], [Disable optional tdb support]),
++    AS_HELP_STRING([--disable-tdb], [Disable optional tdb support]),
+         [
+             case "${enableval}" in
+                 yes) tdb=yes ;;
+@@ -415,7 +429,7 @@ fi
+ ### LYNX documentation generation ###
+ 
+ AC_ARG_ENABLE([lynx],
+-        AC_HELP_STRING([--disable-lynx], [Turn off lynx usage for documentation generation]),
++        AS_HELP_STRING([--disable-lynx], [Turn off lynx usage for documentation generation]),
+                 [
+                         case "${enableval}" in
+                                 yes) lynx=yes ;;
+@@ -561,7 +575,6 @@ GTK_DOC_CHECK(1.9)
+ 
+ AC_CONFIG_FILES([
+ Makefile
+-libltdl/Makefile
+ src/Makefile
+ libcanberra.pc
+ libcanberra-gtk.pc
+diff --git a/doc/README.html.in b/doc/README.html.in
+index d4a3edf..9b9cf04 100644
+--- a/doc/README.html.in
++++ b/doc/README.html.in
+@@ -10,7 +10,7 @@
+ <body>
+ <h1><a name="top">libcanberra @PACKAGE_VERSION@</a></h1>
+ 
+-<p><i>Copyright 2008 Lennart Poettering &lt;@PACKAGE_BUGREPORT@&gt;</i></p>
++<p><i>Copyright 2008-2009 Lennart Poettering &lt;@PACKAGE_BUGREPORT@&gt;</i></p>
+ 
+ <ul class="toc">
+     <li><a href="#license">License</a></li>
+diff --git a/src/Makefile.am b/src/Makefile.am
+index d1b4d89..1fb5168 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -85,8 +85,6 @@ if BUILTIN_DSO
+ libcanberra_la_SOURCES += \
+ 	dso.c \
+ 	driver-order.c driver-order.h
+-libcanberra_la_CFLAGS += \
+-	$(LTDLINCL)
+ libcanberra_la_LIBADD += \
+ 	$(LIBLTDL)
+ 
+diff --git a/src/map-file b/src/map-file
+index 2265ed0..902252a 100644
+--- a/src/map-file
++++ b/src/map-file
+@@ -7,4 +7,7 @@ driver_change_props;
+ driver_destroy;
+ driver_open;
+ driver_play;
++lt_*;
++dlopen_*;
++preopen_*;
+ };
+diff --git a/src/pulse.c b/src/pulse.c
+index 11d6e52..ed371de 100644
+--- a/src/pulse.c
++++ b/src/pulse.c
+@@ -166,12 +166,27 @@ static int translate_error(int error) {
+         [PA_ERR_BADSTATE]             = CA_ERROR_STATE,
+         [PA_ERR_NODATA]               = CA_ERROR_IO,
+         [PA_ERR_VERSION]              = CA_ERROR_NOTSUPPORTED,
+-        [PA_ERR_TOOLARGE]             = CA_ERROR_TOOBIG
++        [PA_ERR_TOOLARGE]             = CA_ERROR_TOOBIG,
++#ifdef PA_ERR_NOTSUPPORTED
++        [PA_ERR_NOTSUPPORTED]         = CA_ERROR_NOTSUPPORTED,
++#endif
++#ifdef PA_ERR_UNKNOWN
++        [PA_ERR_UNKNOWN]              = CA_ERROR_IO,
++#endif
++#ifdef PA_ERR_NOEXTENSION
++        [PA_ERR_NOEXTENSION]          = CA_ERROR_NOTSUPPORTED,
++#endif
++#ifdef PA_ERR_OBSOLETE
++        [PA_ERR_OBSOLETE]             = CA_ERROR_NOTSUPPORTED,
++#endif
++#ifdef PA_ERR_NOTIMPLEMENTED
++        [PA_ERR_NOTIMPLEMENTED]       = CA_ERROR_NOTSUPPORTED
++#endif
+     };
+ 
+     ca_assert(error >= 0);
+ 
+-    if (error >= PA_ERR_MAX)
++    if (error >= PA_ERR_MAX || !table[error])
+         return CA_ERROR_IO;
+ 
+     return table[error];
+@@ -572,7 +587,7 @@ static void stream_write_cb(pa_stream *s, size_t bytes, void *userdata) {
+             goto finish;
+         }
+ 
+-	data = NULL;
++        data = NULL;
+ 
+         bytes -= rbytes;
+     }
+@@ -641,7 +656,11 @@ int driver_play(ca_context *c, uint32_t id, ca_proplist *proplist, ca_finish_cal
+     pa_proplist *l = NULL;
+     const char *n, *vol, *ct;
+     char *name = NULL;
++#if defined(PA_MAJOR) && ((PA_MAJOR > 0) || (PA_MAJOR == 0 && PA_MINOR > 9) || (PA_MAJOR == 0 && PA_MINOR == 9 && PA_MICRO >= 15))
++    pa_volume_t v = (pa_volume_t) -1;
++#else
+     pa_volume_t v = PA_VOLUME_NORM;
++#endif
+     pa_sample_spec ss;
+     ca_cache_control_t cache_control = CA_CACHE_CONTROL_NEVER;
+     struct outstanding *out = NULL;
+@@ -781,7 +800,13 @@ int driver_play(ca_context *c, uint32_t id, ca_proplist *proplist, ca_finish_cal
+     pa_stream_set_state_callback(out->stream, stream_state_cb, out);
+     pa_stream_set_write_callback(out->stream, stream_write_cb, out);
+ 
+-    if (pa_stream_connect_playback(out->stream, NULL, NULL, 0, NULL, NULL) < 0) {
++    if (pa_stream_connect_playback(out->stream, NULL, NULL,
++#ifdef PA_STREAM_FAIL_ON_SUSPEND
++                                   PA_STREAM_FAIL_ON_SUSPEND
++#else
++                                   0
++#endif
++                                   , NULL, NULL) < 0) {
+         ret = translate_error(pa_context_errno(p->context));
+         pa_threaded_mainloop_unlock(p->mainloop);
+         goto finish;

From cecc75bc84ac6cda833512162680f53d96e18746 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@fedoraproject.org>
Date: Wed, 25 Feb 2009 02:57:26 +0000
Subject: [PATCH 008/102] Add missing dependency on gettext-devel

---
 libcanberra.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index 537ce7b..43d9994 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.11
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz
@@ -16,6 +16,7 @@ BuildRequires: pulseaudio-libs-devel >= 0.9.15
 BuildRequires: gstreamer-devel
 BuildRequires: libtdb-devel
 BuildRequires: GConf2-devel
+BuildRequires: gettext-devel
 Requires: sound-theme-freedesktop
 Requires: pulseaudio-libs >= 0.9.15
 Patch0: febbf740799d85dfbdca965efa9867fd70fa2cfc.patch
@@ -119,6 +120,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libcanberra.pc
 
 %changelog
+* Wed Feb 25 2009 Lennart Poettering <lpoetter@redhat.com> 0.11-8
+- Add missing dependency on gettext-devel
+
 * Wed Feb 25 2009 Lennart Poettering <lpoetter@redhat.com> 0.11-7
 - Preview for 0.12
 

From 4f8001f10fb2f36e5e385ea44f799d86d9eb2a24 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@fedoraproject.org>
Date: Wed, 1 Apr 2009 00:31:47 +0000
Subject: [PATCH 009/102] Another preview for 0.12

---
 ...c9e486aa33f7be0cd9ddd315c03780676795.patch | 679 ++++++++++++++++++
 libcanberra.spec                              |   7 +-
 2 files changed, 684 insertions(+), 2 deletions(-)
 create mode 100644 ac5ac9e486aa33f7be0cd9ddd315c03780676795.patch

diff --git a/ac5ac9e486aa33f7be0cd9ddd315c03780676795.patch b/ac5ac9e486aa33f7be0cd9ddd315c03780676795.patch
new file mode 100644
index 0000000..d035324
--- /dev/null
+++ b/ac5ac9e486aa33f7be0cd9ddd315c03780676795.patch
@@ -0,0 +1,679 @@
+diff --git a/Makefile.am b/Makefile.am
+index 507a02f..8db04da 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -19,7 +19,7 @@
+ dist_doc_DATA = README
+ 
+ EXTRA_DIST = bootstrap.sh autogen.sh LGPL libcanberra.schemas
+-SUBDIRS = libltdl src gtkdoc doc
++SUBDIRS = src gtkdoc doc
+ 
+ MAINTAINERCLEANFILES = README
+ noinst_DATA = README
+@@ -51,7 +51,7 @@ ACLOCAL_AMFLAGS = -I m4
+ README:
+ 	rm -f README
+ 	$(MAKE) -C doc README
+-	cd $(srcdir) && ln -s doc/README README
++	ln -s doc/README README
+ 
+ homepage: all dist
+ 	test -d $$HOME/homepage/private
+diff --git a/bootstrap.sh b/bootstrap.sh
+index abeb4f6..29d356f 100755
+--- a/bootstrap.sh
++++ b/bootstrap.sh
+@@ -18,7 +18,7 @@
+ # License along with libcanberra. If not, see
+ # <http://www.gnu.org/licenses/>.
+ 
+-VERSION=1.9
++VERSION=1.10
+ 
+ run_versioned() {
+     local P
+@@ -42,6 +42,15 @@ run_versioned() {
+ 
+ set -ex
+ 
++# We check for this here, because if pkg-config is not found in the
++# system, it's likely that the pkg.m4 macro file is also not present,
++# which will make PKG_PROG_PKG_CONFIG be undefined and the generated
++# configure file faulty.
++if ! pkg-config --version &>/dev/null; then
++    echo "pkg-config is required to bootstrap this program" &>/dev/null
++    exit 1
++fi
++
+ if [ "x$1" = "xam" ] ; then
+     run_versioned automake "$VERSION" -a -c --foreign
+     ./config.status
+@@ -54,7 +63,7 @@ else
+ 
+     mkdir -p m4
+     gtkdocize --copy --flavour no-tmpl --docdir gtkdoc
+-    "$LIBTOOLIZE" -c --force --ltdl --recursive
++    "$LIBTOOLIZE" -c --force --recursive
+     run_versioned aclocal "$VERSION" -I m4
+     run_versioned autoconf 2.63 -Wall
+     run_versioned autoheader 2.63
+diff --git a/configure.ac b/configure.ac
+index 3f1a841..51dc305 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -21,7 +21,7 @@
+ 
+ AC_PREREQ(2.63)
+ 
+-AC_INIT([libcanberra], 0.11, [mzyvopnaoreen (at) 0pointer (dot) de])
++AC_INIT([libcanberra],[0.11],[mzyvopnaoreen (at) 0pointer (dot) de])
+ AC_CONFIG_SRCDIR([src/common.c])
+ AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_MACRO_DIR(m4)
+@@ -65,9 +65,32 @@ done
+ 
+ #### libtool stuff ####
+ LT_PREREQ(2.2)
+-LT_CONFIG_LTDL_DIR([libltdl])
+ LT_INIT([dlopen win32-dll disable-static])
+-LTDL_INIT([convenience recursive])
++
++dnl Unfortunately, even up to libtool 2.2.6a there is no way to know
++dnl exactly which version of libltdl is present in the system, so we
++dnl just assume that it's a working version as long as we have the
++dnl library and the header files.
++dnl
++dnl As an extra safety device, check for lt_dladvise_init() which is
++dnl only implemented in libtool 2.x, and refine as we go if we have
++dnl refined requirements.
++dnl
++dnl Check the header files first since the system may have a
++dnl libltdl.so for runtime, but no headers, and we want to bail out as
++dnl soon as possible.
++dnl
++dnl We don't need any special variable for this though, since the user
++dnl can give the proper place to find libltdl through the standard
++dnl variables like LDFLAGS and CPPFLAGS.
++
++AC_CHECK_HEADER([ltdl.h],
++    [AC_CHECK_LIB([ltdl], [lt_dladvise_init], [LIBLTDL=-lltdl], [LIBLTDL=])],
++    [LIBLTDL=])
++
++AS_IF([test "x$LIBLTDL" = "x"],
++    [AC_MSG_ERROR([Unable to find libltdl.])])
++AC_SUBST([LIBLTDL])
+ 
+ #### Determine build environment ####
+ 
+@@ -109,7 +132,6 @@ AC_TYPE_SIZE_T
+ AC_CHECK_TYPES(ssize_t, , [AC_DEFINE([ssize_t], [signed long],
+     [Define ssize_t if it is not done by the standard libs.])])
+ AC_TYPE_OFF_T
+-AC_TYPE_SIGNAL
+ AC_TYPE_UID_T
+ 
+ #### Check for libs ####
+@@ -158,20 +180,12 @@ AM_ICONV
+ 
+ #### pkg-config ####
+ 
+-# Check for pkg-config manually first, as if its not installed the
+-# PKG_PROG_PKG_CONFIG macro won't be defined.
+-AC_CHECK_PROG(have_pkg_config, pkg-config, yes, no)
+-
+-if test x"$have_pkg_config" = "xno"; then
+-    AC_MSG_ERROR(pkg-config is required to install this program)
+-fi
+-
+ PKG_PROG_PKG_CONFIG
+ 
+ #### ALSA support (optional) ####
+ 
+ AC_ARG_ENABLE([alsa],
+-    AC_HELP_STRING([--disable-alsa], [Disable optional ALSA support]),
++    AS_HELP_STRING([--disable-alsa], [Disable optional ALSA support]),
+         [
+             case "${enableval}" in
+                 yes) alsa=yes ;;
+@@ -203,7 +217,7 @@ AC_SUBST(ALSA_LIBS)
+ ### OSS support (optional) ###
+ 
+ AC_ARG_ENABLE([oss],
+-    AC_HELP_STRING([--disable-oss], [Disable optional OSS support]),
++    AS_HELP_STRING([--disable-oss], [Disable optional OSS support]),
+         [
+             case "${enableval}" in
+                 yes) oss=yes ;;
+@@ -233,7 +247,7 @@ fi
+ ### PulseAudio (optional) ####
+ 
+ AC_ARG_ENABLE([pulse],
+-    AC_HELP_STRING([--disable-pulse], [Disable optional PulseAudio support]),
++    AS_HELP_STRING([--disable-pulse], [Disable optional PulseAudio support]),
+         [
+             case "${enableval}" in
+                 yes) pulse=yes ;;
+@@ -274,7 +288,7 @@ AC_SUBST(PULSE_LIBS)
+ #### GStreamer support (optional) ####
+ 
+ AC_ARG_ENABLE([gstreamer],
+-    AC_HELP_STRING([--disable-gstreamer], [Disable optional GStreamer support]),
++    AS_HELP_STRING([--disable-gstreamer], [Disable optional GStreamer support]),
+         [
+             case "${enableval}" in
+                 yes) gstreamer=yes ;;
+@@ -306,7 +320,7 @@ AC_SUBST(GSTREAMER_LIBS)
+ ### Null output (optional) ####
+ 
+ AC_ARG_ENABLE([null],
+-    AC_HELP_STRING([--disable-null], [Disable optional null output]),
++    AS_HELP_STRING([--disable-null], [Disable optional null output]),
+         [
+             case "${enableval}" in
+                 yes) null=yes ;;
+@@ -326,7 +340,7 @@ fi
+ ### GTK (optional) ####
+ 
+ AC_ARG_ENABLE([gtk],
+-    AC_HELP_STRING([--disable-gtk], [Disable optional GTK+ support]),
++    AS_HELP_STRING([--disable-gtk], [Disable optional GTK+ support]),
+         [
+             case "${enableval}" in
+                 yes) gtk=yes ;;
+@@ -368,7 +382,7 @@ AM_CONDITIONAL([HAVE_GTK], [test "x$HAVE_GTK" = x1])
+ #### TDB cache support (optional) ####
+ 
+ AC_ARG_ENABLE([tdb],
+-    AC_HELP_STRING([--disable-tdb], [Disable optional tdb support]),
++    AS_HELP_STRING([--disable-tdb], [Disable optional tdb support]),
+         [
+             case "${enableval}" in
+                 yes) tdb=yes ;;
+@@ -415,7 +429,7 @@ fi
+ ### LYNX documentation generation ###
+ 
+ AC_ARG_ENABLE([lynx],
+-        AC_HELP_STRING([--disable-lynx], [Turn off lynx usage for documentation generation]),
++        AS_HELP_STRING([--disable-lynx], [Turn off lynx usage for documentation generation]),
+                 [
+                         case "${enableval}" in
+                                 yes) lynx=yes ;;
+@@ -561,7 +575,6 @@ GTK_DOC_CHECK(1.9)
+ 
+ AC_CONFIG_FILES([
+ Makefile
+-libltdl/Makefile
+ src/Makefile
+ libcanberra.pc
+ libcanberra-gtk.pc
+diff --git a/doc/README.html.in b/doc/README.html.in
+index d4a3edf..9b9cf04 100644
+--- a/doc/README.html.in
++++ b/doc/README.html.in
+@@ -10,7 +10,7 @@
+ <body>
+ <h1><a name="top">libcanberra @PACKAGE_VERSION@</a></h1>
+ 
+-<p><i>Copyright 2008 Lennart Poettering &lt;@PACKAGE_BUGREPORT@&gt;</i></p>
++<p><i>Copyright 2008-2009 Lennart Poettering &lt;@PACKAGE_BUGREPORT@&gt;</i></p>
+ 
+ <ul class="toc">
+     <li><a href="#license">License</a></li>
+diff --git a/src/Makefile.am b/src/Makefile.am
+index d1b4d89..e40ec1f 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -52,7 +52,8 @@ libcanberra_la_SOURCES = \
+ 	sound-theme-spec.c sound-theme-spec.h \
+ 	llist.h \
+ 	macro.h macro.c \
+-	malloc.c malloc.h
++	malloc.c malloc.h \
++	fork-detect.c fork-detect.h
+ libcanberra_la_CFLAGS = \
+ 	$(AM_CFLAGS) \
+ 	$(VORBIS_CFLAGS)
+@@ -85,8 +86,6 @@ if BUILTIN_DSO
+ libcanberra_la_SOURCES += \
+ 	dso.c \
+ 	driver-order.c driver-order.h
+-libcanberra_la_CFLAGS += \
+-	$(LTDLINCL)
+ libcanberra_la_LIBADD += \
+ 	$(LIBLTDL)
+ 
+diff --git a/src/canberra-gtk-module.c b/src/canberra-gtk-module.c
+index b9d8ae0..302eeb4 100644
+--- a/src/canberra-gtk-module.c
++++ b/src/canberra-gtk-module.c
+@@ -647,11 +647,15 @@ static gboolean idle_cb(void *userdata) {
+     return FALSE;
+ }
+ 
++static void connect_settings(void);
++
+ static gboolean emission_hook_cb(GSignalInvocationHint *hint, guint n_param_values, const GValue *param_values, gpointer data) {
+     static SoundEventData *d = NULL;
+     GdkEvent *e;
+     GObject *object;
+ 
++    connect_settings();
++
+     if (disabled)
+         return TRUE;
+ 
+@@ -719,15 +723,15 @@ static void enable_input_feedback_sounds_changed(GtkSettings *s, GParamSpec *arg
+     read_enable_input_feedback_sounds(s);
+ }
+ 
+-G_MODULE_EXPORT void gtk_module_init(gint *argc, gchar ***argv[]) {
++static void connect_settings(void) {
+     GtkSettings *s;
++    static gboolean connected = FALSE;
+ 
+-    /* This is the same quark libgnomeui uses! */
+-    disable_sound_quark = g_quark_from_string("gnome_disable_sound_events");
+-    was_hidden_quark = g_quark_from_string("canberra_was_hidden");
++    if (connected)
++        return;
+ 
+-    /* Hook up the gtk setting */
+-    s = gtk_settings_get_default();
++    if (!(s = gtk_settings_get_default()))
++        return;
+ 
+     if (g_object_class_find_property(G_OBJECT_GET_CLASS(s), "gtk-enable-input-feedback-sounds")) {
+         g_signal_connect(G_OBJECT(s), "notify::gtk-enable-input-feedback-sounds", G_CALLBACK(enable_input_feedback_sounds_changed), NULL);
+@@ -735,6 +739,18 @@ G_MODULE_EXPORT void gtk_module_init(gint *argc, gchar ***argv[]) {
+     } else
+         g_debug("This Gtk+ version doesn't have the GtkSettings::gtk-enable-input-feedback-sounds property.");
+ 
++    connected = TRUE;
++}
++
++G_MODULE_EXPORT void gtk_module_init(gint *argc, gchar ***argv[]) {
++
++    /* This is the same quark libgnomeui uses! */
++    disable_sound_quark = g_quark_from_string("gnome_disable_sound_events");
++    was_hidden_quark = g_quark_from_string("canberra_was_hidden");
++
++    /* Hook up the gtk setting */
++    connect_settings();
++
+     install_hook(GTK_TYPE_WINDOW, "show", &signal_id_widget_show);
+     install_hook(GTK_TYPE_WINDOW, "hide", &signal_id_widget_hide);
+     install_hook(GTK_TYPE_DIALOG, "response", &signal_id_dialog_response);
+@@ -749,7 +765,6 @@ G_MODULE_EXPORT void gtk_module_init(gint *argc, gchar ***argv[]) {
+     install_hook(GTK_TYPE_ICON_VIEW, "selection-changed", &signal_id_icon_view_selection_changed);
+ }
+ 
+-
+ G_MODULE_EXPORT gchar* g_module_check_init(GModule *module);
+ 
+ G_MODULE_EXPORT gchar* g_module_check_init(GModule *module) {
+diff --git a/src/canberra-gtk.c b/src/canberra-gtk.c
+index 70b8d7e..cb36a0f 100644
+--- a/src/canberra-gtk.c
++++ b/src/canberra-gtk.c
+@@ -31,6 +31,7 @@
+ #include "common.h"
+ #include "malloc.h"
+ #include "proplist.h"
++#include "fork-detect.h"
+ 
+ /**
+  * SECTION:canberra-gtk
+@@ -93,7 +94,8 @@ ca_context *ca_gtk_context_get(void) {
+     if ((c = g_static_private_get(&context_private)))
+         return c;
+ 
+-    ca_assert_se(ca_context_create(&c) == CA_SUCCESS);
++    if (ca_context_create(&c) != CA_SUCCESS)
++        return NULL;
+ 
+     if ((name = g_get_application_name()))
+         ca_context_change_props(c, CA_PROP_APPLICATION_NAME, name, NULL);
+@@ -154,6 +156,7 @@ int ca_gtk_proplist_set_for_widget(ca_proplist *p, GtkWidget *widget) {
+ 
+     ca_return_val_if_fail(p, CA_ERROR_INVALID);
+     ca_return_val_if_fail(widget, CA_ERROR_INVALID);
++    ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED);
+ 
+     if (!(w = get_toplevel(widget)))
+         return CA_ERROR_INVALID;
+@@ -224,6 +227,7 @@ int ca_gtk_proplist_set_for_event(ca_proplist *p, GdkEvent *e) {
+ 
+     ca_return_val_if_fail(p, CA_ERROR_INVALID);
+     ca_return_val_if_fail(e, CA_ERROR_INVALID);
++    ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED);
+ 
+     if ((gw = e->any.window)) {
+         gdk_window_get_user_data(gw, (gpointer*) &w);
+@@ -297,6 +301,7 @@ int ca_gtk_play_for_widget(GtkWidget *w, uint32_t id, ...) {
+     ca_proplist *p;
+ 
+     ca_return_val_if_fail(w, CA_ERROR_INVALID);
++    ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED);
+ 
+     if ((ret = ca_proplist_create(&p)) < 0)
+         return ret;
+@@ -346,6 +351,7 @@ int ca_gtk_play_for_event(GdkEvent *e, uint32_t id, ...) {
+     ca_proplist *p;
+ 
+     ca_return_val_if_fail(e, CA_ERROR_INVALID);
++    ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED);
+ 
+     if ((ret = ca_proplist_create(&p)) < 0)
+         return ret;
+diff --git a/src/canberra.h b/src/canberra.h
+index ff09146..9664ef2 100644
+--- a/src/canberra.h
++++ b/src/canberra.h
+@@ -414,7 +414,8 @@ enum {
+     CA_ERROR_IO = -14,
+     CA_ERROR_INTERNAL = -15,
+     CA_ERROR_DISABLED = -16,
+-    _CA_ERROR_MAX = -17
++    CA_ERROR_FORKED = -17,
++    _CA_ERROR_MAX = -18
+ };
+ 
+ /**
+diff --git a/src/common.c b/src/common.c
+index e1445f4..ac8b982 100644
+--- a/src/common.c
++++ b/src/common.c
+@@ -30,6 +30,7 @@
+ #include "driver.h"
+ #include "proplist.h"
+ #include "macro.h"
++#include "fork-detect.h"
+ 
+ /**
+  * SECTION:canberra
+@@ -127,6 +128,7 @@ int ca_context_create(ca_context **_c) {
+     int ret;
+     const char *d;
+ 
++    ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED);
+     ca_return_val_if_fail(_c, CA_ERROR_INVALID);
+ 
+     if (!(c = ca_new0(ca_context, 1)))
+@@ -171,6 +173,7 @@ int ca_context_create(ca_context **_c) {
+ int ca_context_destroy(ca_context *c) {
+     int ret = CA_SUCCESS;
+ 
++    ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED);
+     ca_return_val_if_fail(c, CA_ERROR_INVALID);
+ 
+     /* There's no locking necessary here, because the application is
+@@ -209,6 +212,7 @@ int ca_context_set_driver(ca_context *c, const char *driver) {
+     char *n;
+     int ret;
+ 
++    ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED);
+     ca_return_val_if_fail(c, CA_ERROR_INVALID);
+     ca_mutex_lock(c->mutex);
+     ca_return_val_if_fail_unlock(!c->opened, CA_ERROR_STATE, c->mutex);
+@@ -250,6 +254,7 @@ int ca_context_change_device(ca_context *c, const char *device) {
+     char *n;
+     int ret;
+ 
++    ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED);
+     ca_return_val_if_fail(c, CA_ERROR_INVALID);
+     ca_mutex_lock(c->mutex);
+ 
+@@ -277,6 +282,7 @@ fail:
+ static int context_open_unlocked(ca_context *c) {
+     int ret;
+ 
++    ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED);
+     ca_return_val_if_fail(c, CA_ERROR_INVALID);
+ 
+     if (c->opened)
+@@ -302,6 +308,7 @@ static int context_open_unlocked(ca_context *c) {
+ int ca_context_open(ca_context *c) {
+     int ret;
+ 
++    ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED);
+     ca_return_val_if_fail(c, CA_ERROR_INVALID);
+     ca_mutex_lock(c->mutex);
+     ca_return_val_if_fail_unlock(!c->opened, CA_ERROR_STATE, c->mutex);
+@@ -336,6 +343,7 @@ int ca_context_change_props(ca_context *c, ...)  {
+     int ret;
+     ca_proplist *p = NULL;
+ 
++    ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED);
+     ca_return_val_if_fail(c, CA_ERROR_INVALID);
+ 
+     va_start(ap, c);
+@@ -368,6 +376,7 @@ int ca_context_change_props_full(ca_context *c, ca_proplist *p) {
+     int ret;
+     ca_proplist *merged;
+ 
++    ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED);
+     ca_return_val_if_fail(c, CA_ERROR_INVALID);
+     ca_return_val_if_fail(p, CA_ERROR_INVALID);
+ 
+@@ -438,6 +447,7 @@ int ca_context_play(ca_context *c, uint32_t id, ...) {
+     va_list ap;
+     ca_proplist *p = NULL;
+ 
++    ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED);
+     ca_return_val_if_fail(c, CA_ERROR_INVALID);
+ 
+     va_start(ap, id);
+@@ -478,6 +488,7 @@ int ca_context_play_full(ca_context *c, uint32_t id, ca_proplist *p, ca_finish_c
+     const char *t;
+     ca_bool_t enabled = TRUE;
+ 
++    ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED);
+     ca_return_val_if_fail(c, CA_ERROR_INVALID);
+     ca_return_val_if_fail(p, CA_ERROR_INVALID);
+     ca_return_val_if_fail(!userdata || cb, CA_ERROR_INVALID);
+@@ -532,6 +543,7 @@ finish:
+ int ca_context_cancel(ca_context *c, uint32_t id)  {
+     int ret;
+ 
++    ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED);
+     ca_return_val_if_fail(c, CA_ERROR_INVALID);
+     ca_mutex_lock(c->mutex);
+     ca_return_val_if_fail_unlock(c->opened, CA_ERROR_STATE, c->mutex);
+@@ -566,6 +578,7 @@ int ca_context_cache(ca_context *c, ...) {
+     va_list ap;
+     ca_proplist *p = NULL;
+ 
++    ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED);
+     ca_return_val_if_fail(c, CA_ERROR_INVALID);
+ 
+     va_start(ap, c);
+@@ -599,6 +612,7 @@ int ca_context_cache(ca_context *c, ...) {
+ int ca_context_cache_full(ca_context *c, ca_proplist *p) {
+     int ret;
+ 
++    ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED);
+     ca_return_val_if_fail(c, CA_ERROR_INVALID);
+     ca_return_val_if_fail(p, CA_ERROR_INVALID);
+ 
+@@ -648,7 +662,8 @@ const char *ca_strerror(int code) {
+         [-CA_ERROR_ACCESS] = "Access forbidden",
+         [-CA_ERROR_IO] = "IO error",
+         [-CA_ERROR_INTERNAL] = "Internal error",
+-        [-CA_ERROR_DISABLED] = "Sound disabled"
++        [-CA_ERROR_DISABLED] = "Sound disabled",
++        [-CA_ERROR_FORKED] = "Process forked"
+     };
+ 
+     ca_return_val_if_fail(code <= 0, NULL);
+diff --git a/src/fork-detect.c b/src/fork-detect.c
+new file mode 100644
+index 0000000..622037c
+--- /dev/null
++++ b/src/fork-detect.c
+@@ -0,0 +1,51 @@
++/***
++  This file is part of libcanberra.
++
++  Copyright 2009 Lennart Poettering
++
++  libcanberra is free software; you can redistribute it and/or modify
++  it under the terms of the GNU Lesser General Public License as
++  published by the Free Software Foundation, either version 2.1 of the
++  License, or (at your option) any later version.
++
++  libcanberra is distributed in the hope that it will be useful, but
++  WITHOUT ANY WARRANTY; without even the implied warranty of
++  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++  Lesser General Public License for more details.
++
++  You should have received a copy of the GNU Lesser General Public
++  License along with libcanberra. If not, see
++  <http://www.gnu.org/licenses/>.
++***/
++
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
++#include <unistd.h>
++#include <sys/types.h>
++
++#include "fork-detect.h"
++
++int ca_detect_fork(void) {
++    static volatile pid_t pid = (pid_t) -1;
++    pid_t v;
++
++    /* Some really stupid applications (Hey, vim, that means you!)
++     * love to fork after initializing gtk/libcanberra. This is really
++     * bad style. We however have to deal with this cleanly, so we try
++     * to detect the forks making sure all our calls fail cleanly
++     * after the fork. */
++
++    /* Ideally we'd use atomic operations here, but we don't have them
++     * and this is not exactly crucial, so we don't care */
++
++    v = pid;
++
++    if (v == getpid() || v == (pid_t) -1) {
++        pid = getpid();
++        return 0;
++    }
++
++    return 1;
++}
+diff --git a/src/fork-detect.h b/src/fork-detect.h
+new file mode 100644
+index 0000000..9050ef8
+--- /dev/null
++++ b/src/fork-detect.h
+@@ -0,0 +1,26 @@
++#ifndef foocanberraforkdetecth
++#define foocanberraforkdetecth
++
++/***
++  This file is part of libcanberra.
++
++  Copyright 2009 Lennart Poettering
++
++  libcanberra is free software; you can redistribute it and/or modify
++  it under the terms of the GNU Lesser General Public License as
++  published by the Free Software Foundation, either version 2.1 of the
++  License, or (at your option) any later version.
++
++  libcanberra is distributed in the hope that it will be useful, but
++  WITHOUT ANY WARRANTY; without even the implied warranty of
++  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++  Lesser General Public License for more details.
++
++  You should have received a copy of the GNU Lesser General Public
++  License along with libcanberra. If not, see
++  <http://www.gnu.org/licenses/>.
++***/
++
++int ca_detect_fork(void);
++
++#endif
+diff --git a/src/map-file b/src/map-file
+index 2265ed0..902252a 100644
+--- a/src/map-file
++++ b/src/map-file
+@@ -7,4 +7,7 @@ driver_change_props;
+ driver_destroy;
+ driver_open;
+ driver_play;
++lt_*;
++dlopen_*;
++preopen_*;
+ };
+diff --git a/src/pulse.c b/src/pulse.c
+index 11d6e52..ed371de 100644
+--- a/src/pulse.c
++++ b/src/pulse.c
+@@ -166,12 +166,27 @@ static int translate_error(int error) {
+         [PA_ERR_BADSTATE]             = CA_ERROR_STATE,
+         [PA_ERR_NODATA]               = CA_ERROR_IO,
+         [PA_ERR_VERSION]              = CA_ERROR_NOTSUPPORTED,
+-        [PA_ERR_TOOLARGE]             = CA_ERROR_TOOBIG
++        [PA_ERR_TOOLARGE]             = CA_ERROR_TOOBIG,
++#ifdef PA_ERR_NOTSUPPORTED
++        [PA_ERR_NOTSUPPORTED]         = CA_ERROR_NOTSUPPORTED,
++#endif
++#ifdef PA_ERR_UNKNOWN
++        [PA_ERR_UNKNOWN]              = CA_ERROR_IO,
++#endif
++#ifdef PA_ERR_NOEXTENSION
++        [PA_ERR_NOEXTENSION]          = CA_ERROR_NOTSUPPORTED,
++#endif
++#ifdef PA_ERR_OBSOLETE
++        [PA_ERR_OBSOLETE]             = CA_ERROR_NOTSUPPORTED,
++#endif
++#ifdef PA_ERR_NOTIMPLEMENTED
++        [PA_ERR_NOTIMPLEMENTED]       = CA_ERROR_NOTSUPPORTED
++#endif
+     };
+ 
+     ca_assert(error >= 0);
+ 
+-    if (error >= PA_ERR_MAX)
++    if (error >= PA_ERR_MAX || !table[error])
+         return CA_ERROR_IO;
+ 
+     return table[error];
+@@ -572,7 +587,7 @@ static void stream_write_cb(pa_stream *s, size_t bytes, void *userdata) {
+             goto finish;
+         }
+ 
+-	data = NULL;
++        data = NULL;
+ 
+         bytes -= rbytes;
+     }
+@@ -641,7 +656,11 @@ int driver_play(ca_context *c, uint32_t id, ca_proplist *proplist, ca_finish_cal
+     pa_proplist *l = NULL;
+     const char *n, *vol, *ct;
+     char *name = NULL;
++#if defined(PA_MAJOR) && ((PA_MAJOR > 0) || (PA_MAJOR == 0 && PA_MINOR > 9) || (PA_MAJOR == 0 && PA_MINOR == 9 && PA_MICRO >= 15))
++    pa_volume_t v = (pa_volume_t) -1;
++#else
+     pa_volume_t v = PA_VOLUME_NORM;
++#endif
+     pa_sample_spec ss;
+     ca_cache_control_t cache_control = CA_CACHE_CONTROL_NEVER;
+     struct outstanding *out = NULL;
+@@ -781,7 +800,13 @@ int driver_play(ca_context *c, uint32_t id, ca_proplist *proplist, ca_finish_cal
+     pa_stream_set_state_callback(out->stream, stream_state_cb, out);
+     pa_stream_set_write_callback(out->stream, stream_write_cb, out);
+ 
+-    if (pa_stream_connect_playback(out->stream, NULL, NULL, 0, NULL, NULL) < 0) {
++    if (pa_stream_connect_playback(out->stream, NULL, NULL,
++#ifdef PA_STREAM_FAIL_ON_SUSPEND
++                                   PA_STREAM_FAIL_ON_SUSPEND
++#else
++                                   0
++#endif
++                                   , NULL, NULL) < 0) {
+         ret = translate_error(pa_context_errno(p->context));
+         pa_threaded_mainloop_unlock(p->mainloop);
+         goto finish;
diff --git a/libcanberra.spec b/libcanberra.spec
index 43d9994..02aba68 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.11
-Release: 8%{?dist}
+Release: 9%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz
@@ -19,7 +19,7 @@ BuildRequires: GConf2-devel
 BuildRequires: gettext-devel
 Requires: sound-theme-freedesktop
 Requires: pulseaudio-libs >= 0.9.15
-Patch0: febbf740799d85dfbdca965efa9867fd70fa2cfc.patch
+Patch0: ac5ac9e486aa33f7be0cd9ddd315c03780676795.patch
 
 %description
 A small and lightweight implementation of the XDG Sound Theme Specification
@@ -120,6 +120,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libcanberra.pc
 
 %changelog
+* Wed Apr 1 2009 Lennart Poettering <lpoetter@redhat.com> 0.11-9
+- Another preview for 0.12
+
 * Wed Feb 25 2009 Lennart Poettering <lpoetter@redhat.com> 0.11-8
 - Add missing dependency on gettext-devel
 

From 8cbb7176cbd828e16a924912eb07155996e02cdb Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@fedoraproject.org>
Date: Wed, 1 Apr 2009 00:33:08 +0000
Subject: [PATCH 010/102] remove obsolete patch

---
 ...f740799d85dfbdca965efa9867fd70fa2cfc.patch | 317 ------------------
 1 file changed, 317 deletions(-)
 delete mode 100644 febbf740799d85dfbdca965efa9867fd70fa2cfc.patch

diff --git a/febbf740799d85dfbdca965efa9867fd70fa2cfc.patch b/febbf740799d85dfbdca965efa9867fd70fa2cfc.patch
deleted file mode 100644
index 7ee9659..0000000
--- a/febbf740799d85dfbdca965efa9867fd70fa2cfc.patch
+++ /dev/null
@@ -1,317 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 507a02f..8db04da 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -19,7 +19,7 @@
- dist_doc_DATA = README
- 
- EXTRA_DIST = bootstrap.sh autogen.sh LGPL libcanberra.schemas
--SUBDIRS = libltdl src gtkdoc doc
-+SUBDIRS = src gtkdoc doc
- 
- MAINTAINERCLEANFILES = README
- noinst_DATA = README
-@@ -51,7 +51,7 @@ ACLOCAL_AMFLAGS = -I m4
- README:
- 	rm -f README
- 	$(MAKE) -C doc README
--	cd $(srcdir) && ln -s doc/README README
-+	ln -s doc/README README
- 
- homepage: all dist
- 	test -d $$HOME/homepage/private
-diff --git a/bootstrap.sh b/bootstrap.sh
-index abeb4f6..29d356f 100755
---- a/bootstrap.sh
-+++ b/bootstrap.sh
-@@ -18,7 +18,7 @@
- # License along with libcanberra. If not, see
- # <http://www.gnu.org/licenses/>.
- 
--VERSION=1.9
-+VERSION=1.10
- 
- run_versioned() {
-     local P
-@@ -42,6 +42,15 @@ run_versioned() {
- 
- set -ex
- 
-+# We check for this here, because if pkg-config is not found in the
-+# system, it's likely that the pkg.m4 macro file is also not present,
-+# which will make PKG_PROG_PKG_CONFIG be undefined and the generated
-+# configure file faulty.
-+if ! pkg-config --version &>/dev/null; then
-+    echo "pkg-config is required to bootstrap this program" &>/dev/null
-+    exit 1
-+fi
-+
- if [ "x$1" = "xam" ] ; then
-     run_versioned automake "$VERSION" -a -c --foreign
-     ./config.status
-@@ -54,7 +63,7 @@ else
- 
-     mkdir -p m4
-     gtkdocize --copy --flavour no-tmpl --docdir gtkdoc
--    "$LIBTOOLIZE" -c --force --ltdl --recursive
-+    "$LIBTOOLIZE" -c --force --recursive
-     run_versioned aclocal "$VERSION" -I m4
-     run_versioned autoconf 2.63 -Wall
-     run_versioned autoheader 2.63
-diff --git a/configure.ac b/configure.ac
-index 3f1a841..51dc305 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -21,7 +21,7 @@
- 
- AC_PREREQ(2.63)
- 
--AC_INIT([libcanberra], 0.11, [mzyvopnaoreen (at) 0pointer (dot) de])
-+AC_INIT([libcanberra],[0.11],[mzyvopnaoreen (at) 0pointer (dot) de])
- AC_CONFIG_SRCDIR([src/common.c])
- AC_CONFIG_HEADERS([config.h])
- AC_CONFIG_MACRO_DIR(m4)
-@@ -65,9 +65,32 @@ done
- 
- #### libtool stuff ####
- LT_PREREQ(2.2)
--LT_CONFIG_LTDL_DIR([libltdl])
- LT_INIT([dlopen win32-dll disable-static])
--LTDL_INIT([convenience recursive])
-+
-+dnl Unfortunately, even up to libtool 2.2.6a there is no way to know
-+dnl exactly which version of libltdl is present in the system, so we
-+dnl just assume that it's a working version as long as we have the
-+dnl library and the header files.
-+dnl
-+dnl As an extra safety device, check for lt_dladvise_init() which is
-+dnl only implemented in libtool 2.x, and refine as we go if we have
-+dnl refined requirements.
-+dnl
-+dnl Check the header files first since the system may have a
-+dnl libltdl.so for runtime, but no headers, and we want to bail out as
-+dnl soon as possible.
-+dnl
-+dnl We don't need any special variable for this though, since the user
-+dnl can give the proper place to find libltdl through the standard
-+dnl variables like LDFLAGS and CPPFLAGS.
-+
-+AC_CHECK_HEADER([ltdl.h],
-+    [AC_CHECK_LIB([ltdl], [lt_dladvise_init], [LIBLTDL=-lltdl], [LIBLTDL=])],
-+    [LIBLTDL=])
-+
-+AS_IF([test "x$LIBLTDL" = "x"],
-+    [AC_MSG_ERROR([Unable to find libltdl.])])
-+AC_SUBST([LIBLTDL])
- 
- #### Determine build environment ####
- 
-@@ -109,7 +132,6 @@ AC_TYPE_SIZE_T
- AC_CHECK_TYPES(ssize_t, , [AC_DEFINE([ssize_t], [signed long],
-     [Define ssize_t if it is not done by the standard libs.])])
- AC_TYPE_OFF_T
--AC_TYPE_SIGNAL
- AC_TYPE_UID_T
- 
- #### Check for libs ####
-@@ -158,20 +180,12 @@ AM_ICONV
- 
- #### pkg-config ####
- 
--# Check for pkg-config manually first, as if its not installed the
--# PKG_PROG_PKG_CONFIG macro won't be defined.
--AC_CHECK_PROG(have_pkg_config, pkg-config, yes, no)
--
--if test x"$have_pkg_config" = "xno"; then
--    AC_MSG_ERROR(pkg-config is required to install this program)
--fi
--
- PKG_PROG_PKG_CONFIG
- 
- #### ALSA support (optional) ####
- 
- AC_ARG_ENABLE([alsa],
--    AC_HELP_STRING([--disable-alsa], [Disable optional ALSA support]),
-+    AS_HELP_STRING([--disable-alsa], [Disable optional ALSA support]),
-         [
-             case "${enableval}" in
-                 yes) alsa=yes ;;
-@@ -203,7 +217,7 @@ AC_SUBST(ALSA_LIBS)
- ### OSS support (optional) ###
- 
- AC_ARG_ENABLE([oss],
--    AC_HELP_STRING([--disable-oss], [Disable optional OSS support]),
-+    AS_HELP_STRING([--disable-oss], [Disable optional OSS support]),
-         [
-             case "${enableval}" in
-                 yes) oss=yes ;;
-@@ -233,7 +247,7 @@ fi
- ### PulseAudio (optional) ####
- 
- AC_ARG_ENABLE([pulse],
--    AC_HELP_STRING([--disable-pulse], [Disable optional PulseAudio support]),
-+    AS_HELP_STRING([--disable-pulse], [Disable optional PulseAudio support]),
-         [
-             case "${enableval}" in
-                 yes) pulse=yes ;;
-@@ -274,7 +288,7 @@ AC_SUBST(PULSE_LIBS)
- #### GStreamer support (optional) ####
- 
- AC_ARG_ENABLE([gstreamer],
--    AC_HELP_STRING([--disable-gstreamer], [Disable optional GStreamer support]),
-+    AS_HELP_STRING([--disable-gstreamer], [Disable optional GStreamer support]),
-         [
-             case "${enableval}" in
-                 yes) gstreamer=yes ;;
-@@ -306,7 +320,7 @@ AC_SUBST(GSTREAMER_LIBS)
- ### Null output (optional) ####
- 
- AC_ARG_ENABLE([null],
--    AC_HELP_STRING([--disable-null], [Disable optional null output]),
-+    AS_HELP_STRING([--disable-null], [Disable optional null output]),
-         [
-             case "${enableval}" in
-                 yes) null=yes ;;
-@@ -326,7 +340,7 @@ fi
- ### GTK (optional) ####
- 
- AC_ARG_ENABLE([gtk],
--    AC_HELP_STRING([--disable-gtk], [Disable optional GTK+ support]),
-+    AS_HELP_STRING([--disable-gtk], [Disable optional GTK+ support]),
-         [
-             case "${enableval}" in
-                 yes) gtk=yes ;;
-@@ -368,7 +382,7 @@ AM_CONDITIONAL([HAVE_GTK], [test "x$HAVE_GTK" = x1])
- #### TDB cache support (optional) ####
- 
- AC_ARG_ENABLE([tdb],
--    AC_HELP_STRING([--disable-tdb], [Disable optional tdb support]),
-+    AS_HELP_STRING([--disable-tdb], [Disable optional tdb support]),
-         [
-             case "${enableval}" in
-                 yes) tdb=yes ;;
-@@ -415,7 +429,7 @@ fi
- ### LYNX documentation generation ###
- 
- AC_ARG_ENABLE([lynx],
--        AC_HELP_STRING([--disable-lynx], [Turn off lynx usage for documentation generation]),
-+        AS_HELP_STRING([--disable-lynx], [Turn off lynx usage for documentation generation]),
-                 [
-                         case "${enableval}" in
-                                 yes) lynx=yes ;;
-@@ -561,7 +575,6 @@ GTK_DOC_CHECK(1.9)
- 
- AC_CONFIG_FILES([
- Makefile
--libltdl/Makefile
- src/Makefile
- libcanberra.pc
- libcanberra-gtk.pc
-diff --git a/doc/README.html.in b/doc/README.html.in
-index d4a3edf..9b9cf04 100644
---- a/doc/README.html.in
-+++ b/doc/README.html.in
-@@ -10,7 +10,7 @@
- <body>
- <h1><a name="top">libcanberra @PACKAGE_VERSION@</a></h1>
- 
--<p><i>Copyright 2008 Lennart Poettering &lt;@PACKAGE_BUGREPORT@&gt;</i></p>
-+<p><i>Copyright 2008-2009 Lennart Poettering &lt;@PACKAGE_BUGREPORT@&gt;</i></p>
- 
- <ul class="toc">
-     <li><a href="#license">License</a></li>
-diff --git a/src/Makefile.am b/src/Makefile.am
-index d1b4d89..1fb5168 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -85,8 +85,6 @@ if BUILTIN_DSO
- libcanberra_la_SOURCES += \
- 	dso.c \
- 	driver-order.c driver-order.h
--libcanberra_la_CFLAGS += \
--	$(LTDLINCL)
- libcanberra_la_LIBADD += \
- 	$(LIBLTDL)
- 
-diff --git a/src/map-file b/src/map-file
-index 2265ed0..902252a 100644
---- a/src/map-file
-+++ b/src/map-file
-@@ -7,4 +7,7 @@ driver_change_props;
- driver_destroy;
- driver_open;
- driver_play;
-+lt_*;
-+dlopen_*;
-+preopen_*;
- };
-diff --git a/src/pulse.c b/src/pulse.c
-index 11d6e52..ed371de 100644
---- a/src/pulse.c
-+++ b/src/pulse.c
-@@ -166,12 +166,27 @@ static int translate_error(int error) {
-         [PA_ERR_BADSTATE]             = CA_ERROR_STATE,
-         [PA_ERR_NODATA]               = CA_ERROR_IO,
-         [PA_ERR_VERSION]              = CA_ERROR_NOTSUPPORTED,
--        [PA_ERR_TOOLARGE]             = CA_ERROR_TOOBIG
-+        [PA_ERR_TOOLARGE]             = CA_ERROR_TOOBIG,
-+#ifdef PA_ERR_NOTSUPPORTED
-+        [PA_ERR_NOTSUPPORTED]         = CA_ERROR_NOTSUPPORTED,
-+#endif
-+#ifdef PA_ERR_UNKNOWN
-+        [PA_ERR_UNKNOWN]              = CA_ERROR_IO,
-+#endif
-+#ifdef PA_ERR_NOEXTENSION
-+        [PA_ERR_NOEXTENSION]          = CA_ERROR_NOTSUPPORTED,
-+#endif
-+#ifdef PA_ERR_OBSOLETE
-+        [PA_ERR_OBSOLETE]             = CA_ERROR_NOTSUPPORTED,
-+#endif
-+#ifdef PA_ERR_NOTIMPLEMENTED
-+        [PA_ERR_NOTIMPLEMENTED]       = CA_ERROR_NOTSUPPORTED
-+#endif
-     };
- 
-     ca_assert(error >= 0);
- 
--    if (error >= PA_ERR_MAX)
-+    if (error >= PA_ERR_MAX || !table[error])
-         return CA_ERROR_IO;
- 
-     return table[error];
-@@ -572,7 +587,7 @@ static void stream_write_cb(pa_stream *s, size_t bytes, void *userdata) {
-             goto finish;
-         }
- 
--	data = NULL;
-+        data = NULL;
- 
-         bytes -= rbytes;
-     }
-@@ -641,7 +656,11 @@ int driver_play(ca_context *c, uint32_t id, ca_proplist *proplist, ca_finish_cal
-     pa_proplist *l = NULL;
-     const char *n, *vol, *ct;
-     char *name = NULL;
-+#if defined(PA_MAJOR) && ((PA_MAJOR > 0) || (PA_MAJOR == 0 && PA_MINOR > 9) || (PA_MAJOR == 0 && PA_MINOR == 9 && PA_MICRO >= 15))
-+    pa_volume_t v = (pa_volume_t) -1;
-+#else
-     pa_volume_t v = PA_VOLUME_NORM;
-+#endif
-     pa_sample_spec ss;
-     ca_cache_control_t cache_control = CA_CACHE_CONTROL_NEVER;
-     struct outstanding *out = NULL;
-@@ -781,7 +800,13 @@ int driver_play(ca_context *c, uint32_t id, ca_proplist *proplist, ca_finish_cal
-     pa_stream_set_state_callback(out->stream, stream_state_cb, out);
-     pa_stream_set_write_callback(out->stream, stream_write_cb, out);
- 
--    if (pa_stream_connect_playback(out->stream, NULL, NULL, 0, NULL, NULL) < 0) {
-+    if (pa_stream_connect_playback(out->stream, NULL, NULL,
-+#ifdef PA_STREAM_FAIL_ON_SUSPEND
-+                                   PA_STREAM_FAIL_ON_SUSPEND
-+#else
-+                                   0
-+#endif
-+                                   , NULL, NULL) < 0) {
-         ret = translate_error(pa_context_errno(p->context));
-         pa_threaded_mainloop_unlock(p->mainloop);
-         goto finish;

From a1451b89b01595f35e589cb8dc3b65eaa9442102 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@fedoraproject.org>
Date: Tue, 14 Apr 2009 00:49:11 +0000
Subject: [PATCH 011/102] New version 0.12

---
 .cvsignore                                    |   2 +-
 ...c9e486aa33f7be0cd9ddd315c03780676795.patch | 679 ------------------
 libcanberra.spec                              |  12 +-
 sources                                       |   2 +-
 4 files changed, 8 insertions(+), 687 deletions(-)
 delete mode 100644 ac5ac9e486aa33f7be0cd9ddd315c03780676795.patch

diff --git a/.cvsignore b/.cvsignore
index d98ffa2..84fd38c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libcanberra-0.11.tar.gz
+libcanberra-0.12.tar.gz
diff --git a/ac5ac9e486aa33f7be0cd9ddd315c03780676795.patch b/ac5ac9e486aa33f7be0cd9ddd315c03780676795.patch
deleted file mode 100644
index d035324..0000000
--- a/ac5ac9e486aa33f7be0cd9ddd315c03780676795.patch
+++ /dev/null
@@ -1,679 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 507a02f..8db04da 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -19,7 +19,7 @@
- dist_doc_DATA = README
- 
- EXTRA_DIST = bootstrap.sh autogen.sh LGPL libcanberra.schemas
--SUBDIRS = libltdl src gtkdoc doc
-+SUBDIRS = src gtkdoc doc
- 
- MAINTAINERCLEANFILES = README
- noinst_DATA = README
-@@ -51,7 +51,7 @@ ACLOCAL_AMFLAGS = -I m4
- README:
- 	rm -f README
- 	$(MAKE) -C doc README
--	cd $(srcdir) && ln -s doc/README README
-+	ln -s doc/README README
- 
- homepage: all dist
- 	test -d $$HOME/homepage/private
-diff --git a/bootstrap.sh b/bootstrap.sh
-index abeb4f6..29d356f 100755
---- a/bootstrap.sh
-+++ b/bootstrap.sh
-@@ -18,7 +18,7 @@
- # License along with libcanberra. If not, see
- # <http://www.gnu.org/licenses/>.
- 
--VERSION=1.9
-+VERSION=1.10
- 
- run_versioned() {
-     local P
-@@ -42,6 +42,15 @@ run_versioned() {
- 
- set -ex
- 
-+# We check for this here, because if pkg-config is not found in the
-+# system, it's likely that the pkg.m4 macro file is also not present,
-+# which will make PKG_PROG_PKG_CONFIG be undefined and the generated
-+# configure file faulty.
-+if ! pkg-config --version &>/dev/null; then
-+    echo "pkg-config is required to bootstrap this program" &>/dev/null
-+    exit 1
-+fi
-+
- if [ "x$1" = "xam" ] ; then
-     run_versioned automake "$VERSION" -a -c --foreign
-     ./config.status
-@@ -54,7 +63,7 @@ else
- 
-     mkdir -p m4
-     gtkdocize --copy --flavour no-tmpl --docdir gtkdoc
--    "$LIBTOOLIZE" -c --force --ltdl --recursive
-+    "$LIBTOOLIZE" -c --force --recursive
-     run_versioned aclocal "$VERSION" -I m4
-     run_versioned autoconf 2.63 -Wall
-     run_versioned autoheader 2.63
-diff --git a/configure.ac b/configure.ac
-index 3f1a841..51dc305 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -21,7 +21,7 @@
- 
- AC_PREREQ(2.63)
- 
--AC_INIT([libcanberra], 0.11, [mzyvopnaoreen (at) 0pointer (dot) de])
-+AC_INIT([libcanberra],[0.11],[mzyvopnaoreen (at) 0pointer (dot) de])
- AC_CONFIG_SRCDIR([src/common.c])
- AC_CONFIG_HEADERS([config.h])
- AC_CONFIG_MACRO_DIR(m4)
-@@ -65,9 +65,32 @@ done
- 
- #### libtool stuff ####
- LT_PREREQ(2.2)
--LT_CONFIG_LTDL_DIR([libltdl])
- LT_INIT([dlopen win32-dll disable-static])
--LTDL_INIT([convenience recursive])
-+
-+dnl Unfortunately, even up to libtool 2.2.6a there is no way to know
-+dnl exactly which version of libltdl is present in the system, so we
-+dnl just assume that it's a working version as long as we have the
-+dnl library and the header files.
-+dnl
-+dnl As an extra safety device, check for lt_dladvise_init() which is
-+dnl only implemented in libtool 2.x, and refine as we go if we have
-+dnl refined requirements.
-+dnl
-+dnl Check the header files first since the system may have a
-+dnl libltdl.so for runtime, but no headers, and we want to bail out as
-+dnl soon as possible.
-+dnl
-+dnl We don't need any special variable for this though, since the user
-+dnl can give the proper place to find libltdl through the standard
-+dnl variables like LDFLAGS and CPPFLAGS.
-+
-+AC_CHECK_HEADER([ltdl.h],
-+    [AC_CHECK_LIB([ltdl], [lt_dladvise_init], [LIBLTDL=-lltdl], [LIBLTDL=])],
-+    [LIBLTDL=])
-+
-+AS_IF([test "x$LIBLTDL" = "x"],
-+    [AC_MSG_ERROR([Unable to find libltdl.])])
-+AC_SUBST([LIBLTDL])
- 
- #### Determine build environment ####
- 
-@@ -109,7 +132,6 @@ AC_TYPE_SIZE_T
- AC_CHECK_TYPES(ssize_t, , [AC_DEFINE([ssize_t], [signed long],
-     [Define ssize_t if it is not done by the standard libs.])])
- AC_TYPE_OFF_T
--AC_TYPE_SIGNAL
- AC_TYPE_UID_T
- 
- #### Check for libs ####
-@@ -158,20 +180,12 @@ AM_ICONV
- 
- #### pkg-config ####
- 
--# Check for pkg-config manually first, as if its not installed the
--# PKG_PROG_PKG_CONFIG macro won't be defined.
--AC_CHECK_PROG(have_pkg_config, pkg-config, yes, no)
--
--if test x"$have_pkg_config" = "xno"; then
--    AC_MSG_ERROR(pkg-config is required to install this program)
--fi
--
- PKG_PROG_PKG_CONFIG
- 
- #### ALSA support (optional) ####
- 
- AC_ARG_ENABLE([alsa],
--    AC_HELP_STRING([--disable-alsa], [Disable optional ALSA support]),
-+    AS_HELP_STRING([--disable-alsa], [Disable optional ALSA support]),
-         [
-             case "${enableval}" in
-                 yes) alsa=yes ;;
-@@ -203,7 +217,7 @@ AC_SUBST(ALSA_LIBS)
- ### OSS support (optional) ###
- 
- AC_ARG_ENABLE([oss],
--    AC_HELP_STRING([--disable-oss], [Disable optional OSS support]),
-+    AS_HELP_STRING([--disable-oss], [Disable optional OSS support]),
-         [
-             case "${enableval}" in
-                 yes) oss=yes ;;
-@@ -233,7 +247,7 @@ fi
- ### PulseAudio (optional) ####
- 
- AC_ARG_ENABLE([pulse],
--    AC_HELP_STRING([--disable-pulse], [Disable optional PulseAudio support]),
-+    AS_HELP_STRING([--disable-pulse], [Disable optional PulseAudio support]),
-         [
-             case "${enableval}" in
-                 yes) pulse=yes ;;
-@@ -274,7 +288,7 @@ AC_SUBST(PULSE_LIBS)
- #### GStreamer support (optional) ####
- 
- AC_ARG_ENABLE([gstreamer],
--    AC_HELP_STRING([--disable-gstreamer], [Disable optional GStreamer support]),
-+    AS_HELP_STRING([--disable-gstreamer], [Disable optional GStreamer support]),
-         [
-             case "${enableval}" in
-                 yes) gstreamer=yes ;;
-@@ -306,7 +320,7 @@ AC_SUBST(GSTREAMER_LIBS)
- ### Null output (optional) ####
- 
- AC_ARG_ENABLE([null],
--    AC_HELP_STRING([--disable-null], [Disable optional null output]),
-+    AS_HELP_STRING([--disable-null], [Disable optional null output]),
-         [
-             case "${enableval}" in
-                 yes) null=yes ;;
-@@ -326,7 +340,7 @@ fi
- ### GTK (optional) ####
- 
- AC_ARG_ENABLE([gtk],
--    AC_HELP_STRING([--disable-gtk], [Disable optional GTK+ support]),
-+    AS_HELP_STRING([--disable-gtk], [Disable optional GTK+ support]),
-         [
-             case "${enableval}" in
-                 yes) gtk=yes ;;
-@@ -368,7 +382,7 @@ AM_CONDITIONAL([HAVE_GTK], [test "x$HAVE_GTK" = x1])
- #### TDB cache support (optional) ####
- 
- AC_ARG_ENABLE([tdb],
--    AC_HELP_STRING([--disable-tdb], [Disable optional tdb support]),
-+    AS_HELP_STRING([--disable-tdb], [Disable optional tdb support]),
-         [
-             case "${enableval}" in
-                 yes) tdb=yes ;;
-@@ -415,7 +429,7 @@ fi
- ### LYNX documentation generation ###
- 
- AC_ARG_ENABLE([lynx],
--        AC_HELP_STRING([--disable-lynx], [Turn off lynx usage for documentation generation]),
-+        AS_HELP_STRING([--disable-lynx], [Turn off lynx usage for documentation generation]),
-                 [
-                         case "${enableval}" in
-                                 yes) lynx=yes ;;
-@@ -561,7 +575,6 @@ GTK_DOC_CHECK(1.9)
- 
- AC_CONFIG_FILES([
- Makefile
--libltdl/Makefile
- src/Makefile
- libcanberra.pc
- libcanberra-gtk.pc
-diff --git a/doc/README.html.in b/doc/README.html.in
-index d4a3edf..9b9cf04 100644
---- a/doc/README.html.in
-+++ b/doc/README.html.in
-@@ -10,7 +10,7 @@
- <body>
- <h1><a name="top">libcanberra @PACKAGE_VERSION@</a></h1>
- 
--<p><i>Copyright 2008 Lennart Poettering &lt;@PACKAGE_BUGREPORT@&gt;</i></p>
-+<p><i>Copyright 2008-2009 Lennart Poettering &lt;@PACKAGE_BUGREPORT@&gt;</i></p>
- 
- <ul class="toc">
-     <li><a href="#license">License</a></li>
-diff --git a/src/Makefile.am b/src/Makefile.am
-index d1b4d89..e40ec1f 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -52,7 +52,8 @@ libcanberra_la_SOURCES = \
- 	sound-theme-spec.c sound-theme-spec.h \
- 	llist.h \
- 	macro.h macro.c \
--	malloc.c malloc.h
-+	malloc.c malloc.h \
-+	fork-detect.c fork-detect.h
- libcanberra_la_CFLAGS = \
- 	$(AM_CFLAGS) \
- 	$(VORBIS_CFLAGS)
-@@ -85,8 +86,6 @@ if BUILTIN_DSO
- libcanberra_la_SOURCES += \
- 	dso.c \
- 	driver-order.c driver-order.h
--libcanberra_la_CFLAGS += \
--	$(LTDLINCL)
- libcanberra_la_LIBADD += \
- 	$(LIBLTDL)
- 
-diff --git a/src/canberra-gtk-module.c b/src/canberra-gtk-module.c
-index b9d8ae0..302eeb4 100644
---- a/src/canberra-gtk-module.c
-+++ b/src/canberra-gtk-module.c
-@@ -647,11 +647,15 @@ static gboolean idle_cb(void *userdata) {
-     return FALSE;
- }
- 
-+static void connect_settings(void);
-+
- static gboolean emission_hook_cb(GSignalInvocationHint *hint, guint n_param_values, const GValue *param_values, gpointer data) {
-     static SoundEventData *d = NULL;
-     GdkEvent *e;
-     GObject *object;
- 
-+    connect_settings();
-+
-     if (disabled)
-         return TRUE;
- 
-@@ -719,15 +723,15 @@ static void enable_input_feedback_sounds_changed(GtkSettings *s, GParamSpec *arg
-     read_enable_input_feedback_sounds(s);
- }
- 
--G_MODULE_EXPORT void gtk_module_init(gint *argc, gchar ***argv[]) {
-+static void connect_settings(void) {
-     GtkSettings *s;
-+    static gboolean connected = FALSE;
- 
--    /* This is the same quark libgnomeui uses! */
--    disable_sound_quark = g_quark_from_string("gnome_disable_sound_events");
--    was_hidden_quark = g_quark_from_string("canberra_was_hidden");
-+    if (connected)
-+        return;
- 
--    /* Hook up the gtk setting */
--    s = gtk_settings_get_default();
-+    if (!(s = gtk_settings_get_default()))
-+        return;
- 
-     if (g_object_class_find_property(G_OBJECT_GET_CLASS(s), "gtk-enable-input-feedback-sounds")) {
-         g_signal_connect(G_OBJECT(s), "notify::gtk-enable-input-feedback-sounds", G_CALLBACK(enable_input_feedback_sounds_changed), NULL);
-@@ -735,6 +739,18 @@ G_MODULE_EXPORT void gtk_module_init(gint *argc, gchar ***argv[]) {
-     } else
-         g_debug("This Gtk+ version doesn't have the GtkSettings::gtk-enable-input-feedback-sounds property.");
- 
-+    connected = TRUE;
-+}
-+
-+G_MODULE_EXPORT void gtk_module_init(gint *argc, gchar ***argv[]) {
-+
-+    /* This is the same quark libgnomeui uses! */
-+    disable_sound_quark = g_quark_from_string("gnome_disable_sound_events");
-+    was_hidden_quark = g_quark_from_string("canberra_was_hidden");
-+
-+    /* Hook up the gtk setting */
-+    connect_settings();
-+
-     install_hook(GTK_TYPE_WINDOW, "show", &signal_id_widget_show);
-     install_hook(GTK_TYPE_WINDOW, "hide", &signal_id_widget_hide);
-     install_hook(GTK_TYPE_DIALOG, "response", &signal_id_dialog_response);
-@@ -749,7 +765,6 @@ G_MODULE_EXPORT void gtk_module_init(gint *argc, gchar ***argv[]) {
-     install_hook(GTK_TYPE_ICON_VIEW, "selection-changed", &signal_id_icon_view_selection_changed);
- }
- 
--
- G_MODULE_EXPORT gchar* g_module_check_init(GModule *module);
- 
- G_MODULE_EXPORT gchar* g_module_check_init(GModule *module) {
-diff --git a/src/canberra-gtk.c b/src/canberra-gtk.c
-index 70b8d7e..cb36a0f 100644
---- a/src/canberra-gtk.c
-+++ b/src/canberra-gtk.c
-@@ -31,6 +31,7 @@
- #include "common.h"
- #include "malloc.h"
- #include "proplist.h"
-+#include "fork-detect.h"
- 
- /**
-  * SECTION:canberra-gtk
-@@ -93,7 +94,8 @@ ca_context *ca_gtk_context_get(void) {
-     if ((c = g_static_private_get(&context_private)))
-         return c;
- 
--    ca_assert_se(ca_context_create(&c) == CA_SUCCESS);
-+    if (ca_context_create(&c) != CA_SUCCESS)
-+        return NULL;
- 
-     if ((name = g_get_application_name()))
-         ca_context_change_props(c, CA_PROP_APPLICATION_NAME, name, NULL);
-@@ -154,6 +156,7 @@ int ca_gtk_proplist_set_for_widget(ca_proplist *p, GtkWidget *widget) {
- 
-     ca_return_val_if_fail(p, CA_ERROR_INVALID);
-     ca_return_val_if_fail(widget, CA_ERROR_INVALID);
-+    ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED);
- 
-     if (!(w = get_toplevel(widget)))
-         return CA_ERROR_INVALID;
-@@ -224,6 +227,7 @@ int ca_gtk_proplist_set_for_event(ca_proplist *p, GdkEvent *e) {
- 
-     ca_return_val_if_fail(p, CA_ERROR_INVALID);
-     ca_return_val_if_fail(e, CA_ERROR_INVALID);
-+    ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED);
- 
-     if ((gw = e->any.window)) {
-         gdk_window_get_user_data(gw, (gpointer*) &w);
-@@ -297,6 +301,7 @@ int ca_gtk_play_for_widget(GtkWidget *w, uint32_t id, ...) {
-     ca_proplist *p;
- 
-     ca_return_val_if_fail(w, CA_ERROR_INVALID);
-+    ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED);
- 
-     if ((ret = ca_proplist_create(&p)) < 0)
-         return ret;
-@@ -346,6 +351,7 @@ int ca_gtk_play_for_event(GdkEvent *e, uint32_t id, ...) {
-     ca_proplist *p;
- 
-     ca_return_val_if_fail(e, CA_ERROR_INVALID);
-+    ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED);
- 
-     if ((ret = ca_proplist_create(&p)) < 0)
-         return ret;
-diff --git a/src/canberra.h b/src/canberra.h
-index ff09146..9664ef2 100644
---- a/src/canberra.h
-+++ b/src/canberra.h
-@@ -414,7 +414,8 @@ enum {
-     CA_ERROR_IO = -14,
-     CA_ERROR_INTERNAL = -15,
-     CA_ERROR_DISABLED = -16,
--    _CA_ERROR_MAX = -17
-+    CA_ERROR_FORKED = -17,
-+    _CA_ERROR_MAX = -18
- };
- 
- /**
-diff --git a/src/common.c b/src/common.c
-index e1445f4..ac8b982 100644
---- a/src/common.c
-+++ b/src/common.c
-@@ -30,6 +30,7 @@
- #include "driver.h"
- #include "proplist.h"
- #include "macro.h"
-+#include "fork-detect.h"
- 
- /**
-  * SECTION:canberra
-@@ -127,6 +128,7 @@ int ca_context_create(ca_context **_c) {
-     int ret;
-     const char *d;
- 
-+    ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED);
-     ca_return_val_if_fail(_c, CA_ERROR_INVALID);
- 
-     if (!(c = ca_new0(ca_context, 1)))
-@@ -171,6 +173,7 @@ int ca_context_create(ca_context **_c) {
- int ca_context_destroy(ca_context *c) {
-     int ret = CA_SUCCESS;
- 
-+    ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED);
-     ca_return_val_if_fail(c, CA_ERROR_INVALID);
- 
-     /* There's no locking necessary here, because the application is
-@@ -209,6 +212,7 @@ int ca_context_set_driver(ca_context *c, const char *driver) {
-     char *n;
-     int ret;
- 
-+    ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED);
-     ca_return_val_if_fail(c, CA_ERROR_INVALID);
-     ca_mutex_lock(c->mutex);
-     ca_return_val_if_fail_unlock(!c->opened, CA_ERROR_STATE, c->mutex);
-@@ -250,6 +254,7 @@ int ca_context_change_device(ca_context *c, const char *device) {
-     char *n;
-     int ret;
- 
-+    ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED);
-     ca_return_val_if_fail(c, CA_ERROR_INVALID);
-     ca_mutex_lock(c->mutex);
- 
-@@ -277,6 +282,7 @@ fail:
- static int context_open_unlocked(ca_context *c) {
-     int ret;
- 
-+    ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED);
-     ca_return_val_if_fail(c, CA_ERROR_INVALID);
- 
-     if (c->opened)
-@@ -302,6 +308,7 @@ static int context_open_unlocked(ca_context *c) {
- int ca_context_open(ca_context *c) {
-     int ret;
- 
-+    ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED);
-     ca_return_val_if_fail(c, CA_ERROR_INVALID);
-     ca_mutex_lock(c->mutex);
-     ca_return_val_if_fail_unlock(!c->opened, CA_ERROR_STATE, c->mutex);
-@@ -336,6 +343,7 @@ int ca_context_change_props(ca_context *c, ...)  {
-     int ret;
-     ca_proplist *p = NULL;
- 
-+    ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED);
-     ca_return_val_if_fail(c, CA_ERROR_INVALID);
- 
-     va_start(ap, c);
-@@ -368,6 +376,7 @@ int ca_context_change_props_full(ca_context *c, ca_proplist *p) {
-     int ret;
-     ca_proplist *merged;
- 
-+    ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED);
-     ca_return_val_if_fail(c, CA_ERROR_INVALID);
-     ca_return_val_if_fail(p, CA_ERROR_INVALID);
- 
-@@ -438,6 +447,7 @@ int ca_context_play(ca_context *c, uint32_t id, ...) {
-     va_list ap;
-     ca_proplist *p = NULL;
- 
-+    ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED);
-     ca_return_val_if_fail(c, CA_ERROR_INVALID);
- 
-     va_start(ap, id);
-@@ -478,6 +488,7 @@ int ca_context_play_full(ca_context *c, uint32_t id, ca_proplist *p, ca_finish_c
-     const char *t;
-     ca_bool_t enabled = TRUE;
- 
-+    ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED);
-     ca_return_val_if_fail(c, CA_ERROR_INVALID);
-     ca_return_val_if_fail(p, CA_ERROR_INVALID);
-     ca_return_val_if_fail(!userdata || cb, CA_ERROR_INVALID);
-@@ -532,6 +543,7 @@ finish:
- int ca_context_cancel(ca_context *c, uint32_t id)  {
-     int ret;
- 
-+    ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED);
-     ca_return_val_if_fail(c, CA_ERROR_INVALID);
-     ca_mutex_lock(c->mutex);
-     ca_return_val_if_fail_unlock(c->opened, CA_ERROR_STATE, c->mutex);
-@@ -566,6 +578,7 @@ int ca_context_cache(ca_context *c, ...) {
-     va_list ap;
-     ca_proplist *p = NULL;
- 
-+    ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED);
-     ca_return_val_if_fail(c, CA_ERROR_INVALID);
- 
-     va_start(ap, c);
-@@ -599,6 +612,7 @@ int ca_context_cache(ca_context *c, ...) {
- int ca_context_cache_full(ca_context *c, ca_proplist *p) {
-     int ret;
- 
-+    ca_return_val_if_fail(!ca_detect_fork(), CA_ERROR_FORKED);
-     ca_return_val_if_fail(c, CA_ERROR_INVALID);
-     ca_return_val_if_fail(p, CA_ERROR_INVALID);
- 
-@@ -648,7 +662,8 @@ const char *ca_strerror(int code) {
-         [-CA_ERROR_ACCESS] = "Access forbidden",
-         [-CA_ERROR_IO] = "IO error",
-         [-CA_ERROR_INTERNAL] = "Internal error",
--        [-CA_ERROR_DISABLED] = "Sound disabled"
-+        [-CA_ERROR_DISABLED] = "Sound disabled",
-+        [-CA_ERROR_FORKED] = "Process forked"
-     };
- 
-     ca_return_val_if_fail(code <= 0, NULL);
-diff --git a/src/fork-detect.c b/src/fork-detect.c
-new file mode 100644
-index 0000000..622037c
---- /dev/null
-+++ b/src/fork-detect.c
-@@ -0,0 +1,51 @@
-+/***
-+  This file is part of libcanberra.
-+
-+  Copyright 2009 Lennart Poettering
-+
-+  libcanberra is free software; you can redistribute it and/or modify
-+  it under the terms of the GNU Lesser General Public License as
-+  published by the Free Software Foundation, either version 2.1 of the
-+  License, or (at your option) any later version.
-+
-+  libcanberra is distributed in the hope that it will be useful, but
-+  WITHOUT ANY WARRANTY; without even the implied warranty of
-+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+  Lesser General Public License for more details.
-+
-+  You should have received a copy of the GNU Lesser General Public
-+  License along with libcanberra. If not, see
-+  <http://www.gnu.org/licenses/>.
-+***/
-+
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
-+#include <unistd.h>
-+#include <sys/types.h>
-+
-+#include "fork-detect.h"
-+
-+int ca_detect_fork(void) {
-+    static volatile pid_t pid = (pid_t) -1;
-+    pid_t v;
-+
-+    /* Some really stupid applications (Hey, vim, that means you!)
-+     * love to fork after initializing gtk/libcanberra. This is really
-+     * bad style. We however have to deal with this cleanly, so we try
-+     * to detect the forks making sure all our calls fail cleanly
-+     * after the fork. */
-+
-+    /* Ideally we'd use atomic operations here, but we don't have them
-+     * and this is not exactly crucial, so we don't care */
-+
-+    v = pid;
-+
-+    if (v == getpid() || v == (pid_t) -1) {
-+        pid = getpid();
-+        return 0;
-+    }
-+
-+    return 1;
-+}
-diff --git a/src/fork-detect.h b/src/fork-detect.h
-new file mode 100644
-index 0000000..9050ef8
---- /dev/null
-+++ b/src/fork-detect.h
-@@ -0,0 +1,26 @@
-+#ifndef foocanberraforkdetecth
-+#define foocanberraforkdetecth
-+
-+/***
-+  This file is part of libcanberra.
-+
-+  Copyright 2009 Lennart Poettering
-+
-+  libcanberra is free software; you can redistribute it and/or modify
-+  it under the terms of the GNU Lesser General Public License as
-+  published by the Free Software Foundation, either version 2.1 of the
-+  License, or (at your option) any later version.
-+
-+  libcanberra is distributed in the hope that it will be useful, but
-+  WITHOUT ANY WARRANTY; without even the implied warranty of
-+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+  Lesser General Public License for more details.
-+
-+  You should have received a copy of the GNU Lesser General Public
-+  License along with libcanberra. If not, see
-+  <http://www.gnu.org/licenses/>.
-+***/
-+
-+int ca_detect_fork(void);
-+
-+#endif
-diff --git a/src/map-file b/src/map-file
-index 2265ed0..902252a 100644
---- a/src/map-file
-+++ b/src/map-file
-@@ -7,4 +7,7 @@ driver_change_props;
- driver_destroy;
- driver_open;
- driver_play;
-+lt_*;
-+dlopen_*;
-+preopen_*;
- };
-diff --git a/src/pulse.c b/src/pulse.c
-index 11d6e52..ed371de 100644
---- a/src/pulse.c
-+++ b/src/pulse.c
-@@ -166,12 +166,27 @@ static int translate_error(int error) {
-         [PA_ERR_BADSTATE]             = CA_ERROR_STATE,
-         [PA_ERR_NODATA]               = CA_ERROR_IO,
-         [PA_ERR_VERSION]              = CA_ERROR_NOTSUPPORTED,
--        [PA_ERR_TOOLARGE]             = CA_ERROR_TOOBIG
-+        [PA_ERR_TOOLARGE]             = CA_ERROR_TOOBIG,
-+#ifdef PA_ERR_NOTSUPPORTED
-+        [PA_ERR_NOTSUPPORTED]         = CA_ERROR_NOTSUPPORTED,
-+#endif
-+#ifdef PA_ERR_UNKNOWN
-+        [PA_ERR_UNKNOWN]              = CA_ERROR_IO,
-+#endif
-+#ifdef PA_ERR_NOEXTENSION
-+        [PA_ERR_NOEXTENSION]          = CA_ERROR_NOTSUPPORTED,
-+#endif
-+#ifdef PA_ERR_OBSOLETE
-+        [PA_ERR_OBSOLETE]             = CA_ERROR_NOTSUPPORTED,
-+#endif
-+#ifdef PA_ERR_NOTIMPLEMENTED
-+        [PA_ERR_NOTIMPLEMENTED]       = CA_ERROR_NOTSUPPORTED
-+#endif
-     };
- 
-     ca_assert(error >= 0);
- 
--    if (error >= PA_ERR_MAX)
-+    if (error >= PA_ERR_MAX || !table[error])
-         return CA_ERROR_IO;
- 
-     return table[error];
-@@ -572,7 +587,7 @@ static void stream_write_cb(pa_stream *s, size_t bytes, void *userdata) {
-             goto finish;
-         }
- 
--	data = NULL;
-+        data = NULL;
- 
-         bytes -= rbytes;
-     }
-@@ -641,7 +656,11 @@ int driver_play(ca_context *c, uint32_t id, ca_proplist *proplist, ca_finish_cal
-     pa_proplist *l = NULL;
-     const char *n, *vol, *ct;
-     char *name = NULL;
-+#if defined(PA_MAJOR) && ((PA_MAJOR > 0) || (PA_MAJOR == 0 && PA_MINOR > 9) || (PA_MAJOR == 0 && PA_MINOR == 9 && PA_MICRO >= 15))
-+    pa_volume_t v = (pa_volume_t) -1;
-+#else
-     pa_volume_t v = PA_VOLUME_NORM;
-+#endif
-     pa_sample_spec ss;
-     ca_cache_control_t cache_control = CA_CACHE_CONTROL_NEVER;
-     struct outstanding *out = NULL;
-@@ -781,7 +800,13 @@ int driver_play(ca_context *c, uint32_t id, ca_proplist *proplist, ca_finish_cal
-     pa_stream_set_state_callback(out->stream, stream_state_cb, out);
-     pa_stream_set_write_callback(out->stream, stream_write_cb, out);
- 
--    if (pa_stream_connect_playback(out->stream, NULL, NULL, 0, NULL, NULL) < 0) {
-+    if (pa_stream_connect_playback(out->stream, NULL, NULL,
-+#ifdef PA_STREAM_FAIL_ON_SUSPEND
-+                                   PA_STREAM_FAIL_ON_SUSPEND
-+#else
-+                                   0
-+#endif
-+                                   , NULL, NULL) < 0) {
-         ret = translate_error(pa_context_errno(p->context));
-         pa_threaded_mainloop_unlock(p->mainloop);
-         goto finish;
diff --git a/libcanberra.spec b/libcanberra.spec
index 02aba68..1b896a9 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
-Version: 0.11
-Release: 9%{?dist}
+Version: 0.12
+Release: 1%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz
@@ -19,7 +19,6 @@ BuildRequires: GConf2-devel
 BuildRequires: gettext-devel
 Requires: sound-theme-freedesktop
 Requires: pulseaudio-libs >= 0.9.15
-Patch0: ac5ac9e486aa33f7be0cd9ddd315c03780676795.patch
 
 %description
 A small and lightweight implementation of the XDG Sound Theme Specification
@@ -73,10 +72,9 @@ fi
 
 %prep
 %setup -q
-%patch0 -p1 -b .febbf740799d85dfbdca965efa9867fd70fa2cfc
 
 %build
-%configure --disable-static --disable-rpath --enable-pulse --enable-alsa --enable-null --with-builtin=dso
+%configure --disable-static --disable-rpath --enable-pulse --enable-alsa --enable-null --enable-gstreamer --disable-oss --with-builtin=dso
 make %{?_smp_mflags}
 
 %install
@@ -97,7 +95,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libcanberra-%{version}/libcanberra-pulse.so
 %{_libdir}/libcanberra-%{version}/libcanberra-null.so
 %{_libdir}/libcanberra-%{version}/libcanberra-multi.so
-%{_libdir}/libcanberra-%{version}/libcanberra-oss.so
 %{_libdir}/libcanberra-%{version}/libcanberra-gstreamer.so
 
 %files gtk2
@@ -120,6 +117,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libcanberra.pc
 
 %changelog
+* Mon Apr 13 2009 Lennart Poettering <lpoetter@redhat.com> 0.12-1
+- New version 0.12
+
 * Wed Apr 1 2009 Lennart Poettering <lpoetter@redhat.com> 0.11-9
 - Another preview for 0.12
 
diff --git a/sources b/sources
index 7452afe..c92301f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c661db14cb0b1fe9b6963defacc3bba6  libcanberra-0.11.tar.gz
+01a1952e861defa6de9d193558f2a732  libcanberra-0.12.tar.gz

From 10f357d0d65cca5c6a798ea83a43cb097b0a2cbf Mon Sep 17 00:00:00 2001
From: Brian Pepple <bpepple@fedoraproject.org>
Date: Tue, 16 Jun 2009 23:41:14 +0000
Subject: [PATCH 012/102] - Rebuild for new libtdb.

---
 libcanberra.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index 1b896a9..242978f 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.12
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz
@@ -117,6 +117,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libcanberra.pc
 
 %changelog
+* Tue Jun 16 2009 Brian Pepple <bpepple@fedoraproject.org> - 0.12-2
+- Rebuild for new libtdb.
+
 * Mon Apr 13 2009 Lennart Poettering <lpoetter@redhat.com> 0.12-1
 - New version 0.12
 

From e8606a46ee573747f183defe83ba8626836962cd Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@fedoraproject.org>
Date: Tue, 23 Jun 2009 18:43:11 +0000
Subject: [PATCH 013/102] New version 0.13

---
 .cvsignore       | 2 +-
 libcanberra.spec | 7 +++++--
 sources          | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 84fd38c..658f751 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libcanberra-0.12.tar.gz
+libcanberra-0.13.tar.gz
diff --git a/libcanberra.spec b/libcanberra.spec
index 242978f..0a59a1a 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
-Version: 0.12
-Release: 2%{?dist}
+Version: 0.13
+Release: 1%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz
@@ -117,6 +117,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libcanberra.pc
 
 %changelog
+* Tue Jun 23 2009 Lennart Poettering <lpoetter@redhat.com> 0.13-1
+- New version 0.13
+
 * Tue Jun 16 2009 Brian Pepple <bpepple@fedoraproject.org> - 0.12-2
 - Rebuild for new libtdb.
 
diff --git a/sources b/sources
index c92301f..304294b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-01a1952e861defa6de9d193558f2a732  libcanberra-0.12.tar.gz
+51da42b976626247f4f2cb18895d4531  libcanberra-0.13.tar.gz

From 25f0a5edaa2bc0091baa4fcb41c486ff78b1116d Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@fedoraproject.org>
Date: Thu, 2 Jul 2009 01:02:15 +0000
Subject: [PATCH 014/102] new release

---
 .cvsignore       | 2 +-
 libcanberra.spec | 5 ++++-
 sources          | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 658f751..337726d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libcanberra-0.13.tar.gz
+libcanberra-0.14.tar.gz
diff --git a/libcanberra.spec b/libcanberra.spec
index 0a59a1a..95d2d0c 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,5 +1,5 @@
 Name: libcanberra
-Version: 0.13
+Version: 0.14
 Release: 1%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
@@ -117,6 +117,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libcanberra.pc
 
 %changelog
+* Thu Jul 2 2009 Lennart Poettering <lpoetter@redhat.com> 0.14-1
+- New version 0.14
+
 * Tue Jun 23 2009 Lennart Poettering <lpoetter@redhat.com> 0.13-1
 - New version 0.13
 
diff --git a/sources b/sources
index 304294b..e03ce42 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-51da42b976626247f4f2cb18895d4531  libcanberra-0.13.tar.gz
+1c2463ea726b6919681449f16534a4c0  libcanberra-0.14.tar.gz

From fedeff437dc436179a6d11af5e07dae104944583 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@fedoraproject.org>
Date: Thu, 2 Jul 2009 01:18:57 +0000
Subject: [PATCH 015/102] fix tarball

---
 libcanberra.spec | 5 ++++-
 sources          | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index 95d2d0c..5fd8beb 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.14
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz
@@ -117,6 +117,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libcanberra.pc
 
 %changelog
+* Thu Jul 2 2009 Lennart Poettering <lpoetter@redhat.com> 0.14-2
+- Upload the right tarball
+
 * Thu Jul 2 2009 Lennart Poettering <lpoetter@redhat.com> 0.14-1
 - New version 0.14
 
diff --git a/sources b/sources
index e03ce42..7e2caf1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1c2463ea726b6919681449f16534a4c0  libcanberra-0.14.tar.gz
+b182ab134a911ba6c42ea2b727eda13e  libcanberra-0.14.tar.gz

From 796146f55cbb6196f8e221a5f4fb3549aefeb9f5 Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating@fedoraproject.org>
Date: Sat, 25 Jul 2009 05:23:47 +0000
Subject: [PATCH 016/102] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

---
 libcanberra.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index 5fd8beb..af6d338 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.14
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz
@@ -117,6 +117,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libcanberra.pc
 
 %changelog
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.14-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Jul 2 2009 Lennart Poettering <lpoetter@redhat.com> 0.14-2
 - Upload the right tarball
 

From 3042499911d0dd35baa54209e0dfb4eb3cf6c8ad Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@fedoraproject.org>
Date: Wed, 5 Aug 2009 01:32:54 +0000
Subject: [PATCH 017/102] new release

---
 libcanberra.spec | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index af6d338..b43f7a5 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
-Version: 0.14
-Release: 3%{?dist}
+Version: 0.15
+Release: 1%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz
@@ -74,7 +74,7 @@ fi
 %setup -q
 
 %build
-%configure --disable-static --disable-rpath --enable-pulse --enable-alsa --enable-null --enable-gstreamer --disable-oss --with-builtin=dso
+%configure --disable-static --enable-pulse --enable-alsa --enable-null --enable-gstreamer --disable-oss --with-builtin=dso
 make %{?_smp_mflags}
 
 %install
@@ -117,6 +117,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libcanberra.pc
 
 %changelog
+* Wed Aug 5 2009 Lennart Poettering <lpoetter@redhat.com> 0.15-1
+- New version 0.15
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.14-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 

From b7ad2273479309a3450c1f2d69f3e8436c591dab Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@fedoraproject.org>
Date: Wed, 5 Aug 2009 01:34:12 +0000
Subject: [PATCH 018/102] new release

---
 .cvsignore       | 2 +-
 libcanberra.spec | 5 ++++-
 sources          | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 337726d..5e1407a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libcanberra-0.14.tar.gz
+libcanberra-0.15.tar.gz
diff --git a/libcanberra.spec b/libcanberra.spec
index b43f7a5..22e4f3e 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.15
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz
@@ -117,6 +117,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libcanberra.pc
 
 %changelog
+* Wed Aug 5 2009 Lennart Poettering <lpoetter@redhat.com> 0.15-2
+- Fix mistag
+
 * Wed Aug 5 2009 Lennart Poettering <lpoetter@redhat.com> 0.15-1
 - New version 0.15
 
diff --git a/sources b/sources
index 7e2caf1..19b4909 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b182ab134a911ba6c42ea2b727eda13e  libcanberra-0.14.tar.gz
+1f0a67c851693a45e0a48ae6142539cc  libcanberra-0.15.tar.gz

From 4d01808ed07626f3402f26ed70e36b3388a16c81 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@fedoraproject.org>
Date: Thu, 27 Aug 2009 02:27:20 +0000
Subject: [PATCH 019/102] new upstream release

---
 .cvsignore       | 2 +-
 libcanberra.spec | 7 +++++--
 sources          | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 5e1407a..66e265d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libcanberra-0.15.tar.gz
+libcanberra-0.16.tar.gz
diff --git a/libcanberra.spec b/libcanberra.spec
index 22e4f3e..0efdedf 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
-Version: 0.15
-Release: 2%{?dist}
+Version: 0.16
+Release: 1%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz
@@ -117,6 +117,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libcanberra.pc
 
 %changelog
+* Thu Aug 27 2009 Lennart Poettering <lpoetter@redhat.com> 0.16-1
+- New version 0.16
+
 * Wed Aug 5 2009 Lennart Poettering <lpoetter@redhat.com> 0.15-2
 - Fix mistag
 
diff --git a/sources b/sources
index 19b4909..6b4f68a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1f0a67c851693a45e0a48ae6142539cc  libcanberra-0.15.tar.gz
+f93e49442e336e3e99cd6f33a7373b8b  libcanberra-0.16.tar.gz

From 93b436a73a5e00807519dca586598cc94859583a Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@fedoraproject.org>
Date: Fri, 11 Sep 2009 22:23:59 +0000
Subject: [PATCH 020/102] New version 0.17

---
 .cvsignore       |  2 +-
 libcanberra.spec | 10 +++++++++-
 sources          |  2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 66e265d..3f12bde 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libcanberra-0.16.tar.gz
+libcanberra-0.17.tar.gz
diff --git a/libcanberra.spec b/libcanberra.spec
index 0efdedf..eb39dac 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,5 +1,5 @@
 Name: libcanberra
-Version: 0.16
+Version: 0.17
 Release: 1%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
@@ -31,6 +31,7 @@ Requires: %{name} = %{version}-%{release}
 Requires(pre): GConf2
 Requires(preun): GConf2
 Requires(post): GConf2
+Requires: gdm
 
 %description gtk2
 Gtk+ bindings for libcanberra
@@ -42,6 +43,7 @@ Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
 Requires: gtk-doc
 Requires: gtk2-devel
+Requires: vala
 
 %description devel
 Development Files for libcanberra Client Development
@@ -104,6 +106,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/canberra-gtk-play
 %{_datadir}/gnome/autostart/libcanberra-login-sound.desktop
 %{_datadir}/gnome/shutdown/libcanberra-logout-sound.sh
+%{_datadir}/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop
 %{_sysconfdir}/gconf/schemas/libcanberra.schemas
 
 %files devel
@@ -115,8 +118,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libcanberra.so
 %{_libdir}/pkgconfig/libcanberra-gtk.pc
 %{_libdir}/pkgconfig/libcanberra.pc
+%{_datadir}/vala/vapi/libcanberra-gtk.vapi
+%{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Fri Sep 12 2009 Lennart Poettering <lpoetter@redhat.com> 0.17-1
+- New version 0.17
+
 * Thu Aug 27 2009 Lennart Poettering <lpoetter@redhat.com> 0.16-1
 - New version 0.16
 
diff --git a/sources b/sources
index 6b4f68a..34c0a84 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f93e49442e336e3e99cd6f33a7373b8b  libcanberra-0.16.tar.gz
+d1f5c5956d65d289566197e620be1a2e  libcanberra-0.17.tar.gz

From f18fa267c7fec840bba55ca30414d0f3d57b37e8 Mon Sep 17 00:00:00 2001
From: Kevin Kofler <kkofler@fedoraproject.org>
Date: Wed, 16 Sep 2009 22:14:32 +0000
Subject: [PATCH 021/102] - Don't require gdm in -gtk2 (#522998)

---
 libcanberra.spec | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index eb39dac..846a84e 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.17
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz
@@ -31,7 +31,6 @@ Requires: %{name} = %{version}-%{release}
 Requires(pre): GConf2
 Requires(preun): GConf2
 Requires(post): GConf2
-Requires: gdm
 
 %description gtk2
 Gtk+ bindings for libcanberra
@@ -106,6 +105,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/canberra-gtk-play
 %{_datadir}/gnome/autostart/libcanberra-login-sound.desktop
 %{_datadir}/gnome/shutdown/libcanberra-logout-sound.sh
+# co-own these directories to avoid requiring GDM (#522998)
+%dir %{_datadir}/gdm/
+%dir %{_datadir}/gdm/autostart/
+%dir %{_datadir}/gdm/autostart/LoginWindow/
 %{_datadir}/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop
 %{_sysconfdir}/gconf/schemas/libcanberra.schemas
 
@@ -122,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Wed Sep 16 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> 0.17-2
+- Don't require gdm in -gtk2 (#522998)
+
 * Fri Sep 12 2009 Lennart Poettering <lpoetter@redhat.com> 0.17-1
 - New version 0.17
 

From 417454ad30c318fc9905f43900384b4fd9f07fb2 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@fedoraproject.org>
Date: Sun, 20 Sep 2009 18:07:11 +0000
Subject: [PATCH 022/102] new upstream release

---
 .cvsignore       | 2 +-
 libcanberra.spec | 7 +++++--
 sources          | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 3f12bde..5d806ab 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libcanberra-0.17.tar.gz
+libcanberra-0.18.tar.gz
diff --git a/libcanberra.spec b/libcanberra.spec
index 846a84e..5ebb9bd 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
-Version: 0.17
-Release: 2%{?dist}
+Version: 0.18
+Release: 1%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz
@@ -125,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Sat Sep 19 2009 Lennart Poettering <lpoetter@redhat.com> 0.18-1
+- New version 0.18
+
 * Wed Sep 16 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> 0.17-2
 - Don't require gdm in -gtk2 (#522998)
 
diff --git a/sources b/sources
index 34c0a84..b42f55f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d1f5c5956d65d289566197e620be1a2e  libcanberra-0.17.tar.gz
+395e83f7eac48b3ce8372a714026c85d  libcanberra-0.18.tar.gz

From 7c312fac1a732e57c2bb43ad436ccd2090b92a78 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Fri, 25 Sep 2009 15:37:01 +0000
Subject: [PATCH 023/102] don't require vala

---
 libcanberra.spec | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index 5ebb9bd..35b1c63 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.18
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz
@@ -42,7 +42,6 @@ Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
 Requires: gtk-doc
 Requires: gtk2-devel
-Requires: vala
 
 %description devel
 Development Files for libcanberra Client Development
@@ -121,10 +120,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libcanberra.so
 %{_libdir}/pkgconfig/libcanberra-gtk.pc
 %{_libdir}/pkgconfig/libcanberra.pc
+# co-own these directories to avoid requiring vala
+%dir %{_datadir}/vala
+%dir %{_datadir}/vala/vapi
 %{_datadir}/vala/vapi/libcanberra-gtk.vapi
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Fri Sep 25 2009 Matthias Clasen <mclasen@redhat.com> - 0.18-2
+- Don't require vala in -devel (#523473)
+
 * Sat Sep 19 2009 Lennart Poettering <lpoetter@redhat.com> 0.18-1
 - New version 0.18
 

From c3cb39e47f7819e330f9239f826dbb9e64e7c93f Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@fedoraproject.org>
Date: Wed, 14 Oct 2009 19:11:56 +0000
Subject: [PATCH 024/102] New version 0.19

---
 .cvsignore       | 2 +-
 libcanberra.spec | 7 +++++--
 sources          | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 5d806ab..5261784 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libcanberra-0.18.tar.gz
+libcanberra-0.19.tar.gz
diff --git a/libcanberra.spec b/libcanberra.spec
index 35b1c63..3cc7ca3 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
-Version: 0.18
-Release: 2%{?dist}
+Version: 0.19
+Release: 1%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz
@@ -127,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Wed Oct 14 2009 Lennart Poettering <lpoetter@redhat.com> 0.19-1
+- New version 0.19
+
 * Fri Sep 25 2009 Matthias Clasen <mclasen@redhat.com> - 0.18-2
 - Don't require vala in -devel (#523473)
 
diff --git a/sources b/sources
index b42f55f..c738ea1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-395e83f7eac48b3ce8372a714026c85d  libcanberra-0.18.tar.gz
+4c7a718b8314d87737e4f91c2a06e1fc  libcanberra-0.19.tar.gz

From 06a9ce9cfd6ad351f71c1af76712e9ee1b7e162d Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@fedoraproject.org>
Date: Thu, 15 Oct 2009 02:43:49 +0000
Subject: [PATCH 025/102] New version 0.20

---
 .cvsignore       | 2 +-
 libcanberra.spec | 5 ++++-
 sources          | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 5261784..338041f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libcanberra-0.19.tar.gz
+libcanberra-0.20.tar.gz
diff --git a/libcanberra.spec b/libcanberra.spec
index 3cc7ca3..b5eaec5 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,5 +1,5 @@
 Name: libcanberra
-Version: 0.19
+Version: 0.20
 Release: 1%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
@@ -127,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Thu Oct 15 2009 Lennart Poettering <lpoetter@redhat.com> 0.20-1
+- New version 0.20
+
 * Wed Oct 14 2009 Lennart Poettering <lpoetter@redhat.com> 0.19-1
 - New version 0.19
 
diff --git a/sources b/sources
index c738ea1..12c70ff 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4c7a718b8314d87737e4f91c2a06e1fc  libcanberra-0.19.tar.gz
+2f603086a1c994e96143c18739bc4200  libcanberra-0.20.tar.gz

From 857b9fcd7e4c67b4b466d906f05af00e419e9db7 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@fedoraproject.org>
Date: Thu, 15 Oct 2009 23:20:49 +0000
Subject: [PATCH 026/102] New version 0.21

---
 .cvsignore       | 2 +-
 libcanberra.spec | 5 ++++-
 sources          | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 338041f..afa8d8e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libcanberra-0.20.tar.gz
+libcanberra-0.21.tar.gz
diff --git a/libcanberra.spec b/libcanberra.spec
index b5eaec5..e1757ae 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,5 +1,5 @@
 Name: libcanberra
-Version: 0.20
+Version: 0.21
 Release: 1%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
@@ -127,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Fri Oct 16 2009 Lennart Poettering <lpoetter@redhat.com> 0.21-1
+- New version 0.21
+
 * Thu Oct 15 2009 Lennart Poettering <lpoetter@redhat.com> 0.20-1
 - New version 0.20
 
diff --git a/sources b/sources
index 12c70ff..ce3d417 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2f603086a1c994e96143c18739bc4200  libcanberra-0.20.tar.gz
+6d7b5eb6be8fca491008da529a02f5d5  libcanberra-0.21.tar.gz

From 55d46c741b504dec1ebc66352f48bbf9fe7444a5 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@fedoraproject.org>
Date: Tue, 20 Oct 2009 01:35:00 +0000
Subject: [PATCH 027/102] New version 0.22

---
 .cvsignore       | 2 +-
 libcanberra.spec | 5 ++++-
 sources          | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index afa8d8e..0cc410f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libcanberra-0.21.tar.gz
+libcanberra-0.22.tar.gz
diff --git a/libcanberra.spec b/libcanberra.spec
index e1757ae..e80a3eb 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,5 +1,5 @@
 Name: libcanberra
-Version: 0.21
+Version: 0.22
 Release: 1%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
@@ -127,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Tue Oct 20 2009 Lennart Poettering <lpoetter@redhat.com> 0.22-1
+- New version 0.22
+
 * Fri Oct 16 2009 Lennart Poettering <lpoetter@redhat.com> 0.21-1
 - New version 0.21
 
diff --git a/sources b/sources
index ce3d417..3b84408 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6d7b5eb6be8fca491008da529a02f5d5  libcanberra-0.21.tar.gz
+e24e2f956fedfbcc58edfa40471b18d8  libcanberra-0.22.tar.gz

From 7468cab5899ad1b67a21b9031f21a03156b25b13 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Wed, 25 Nov 2009 23:50:52 +0000
Subject: [PATCH 028/102] Fix typo that causes a failure to update the common
 directory. (releng     #2781)

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 6498fce..4ad9d15 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ NAME := libcanberra
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
 endef
 
 MAKEFILE_COMMON := $(shell $(find-makefile-common))

From 6f8060148c05730c1e256bc57d498fe270e86f89 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@fedoraproject.org>
Date: Sat, 20 Feb 2010 16:54:23 +0000
Subject: [PATCH 029/102] 0.23

---
 .cvsignore       | 2 +-
 libcanberra.spec | 5 ++++-
 sources          | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 0cc410f..1dca496 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libcanberra-0.22.tar.gz
+libcanberra-0.23.tar.gz
diff --git a/libcanberra.spec b/libcanberra.spec
index e80a3eb..979cc0e 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,5 +1,5 @@
 Name: libcanberra
-Version: 0.22
+Version: 0.23
 Release: 1%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
@@ -127,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Sat Feb 20 2010 Lennart Poettering <lpoetter@redhat.com> 0.23-1
+- New version 0.23
+
 * Tue Oct 20 2009 Lennart Poettering <lpoetter@redhat.com> 0.22-1
 - New version 0.22
 
diff --git a/sources b/sources
index 3b84408..60fb4b9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e24e2f956fedfbcc58edfa40471b18d8  libcanberra-0.22.tar.gz
+83fb2fb7608c77f91904e12a867534fd  libcanberra-0.23.tar.gz

From c5b44c91d2f1935ef655f633e423e0918cab1e65 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@fedoraproject.org>
Date: Sun, 13 Jun 2010 18:00:50 +0000
Subject: [PATCH 030/102] New version 0.25; gtk3 support

---
 .cvsignore       |  2 +-
 libcanberra.spec | 63 +++++++++++++++++++++++++++++++-----------------
 sources          |  2 +-
 3 files changed, 43 insertions(+), 24 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 1dca496..eeab51b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libcanberra-0.23.tar.gz
+libcanberra-0.25.tar.gz
diff --git a/libcanberra.spec b/libcanberra.spec
index 979cc0e..d51118d 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,5 +1,5 @@
 Name: libcanberra
-Version: 0.23
+Version: 0.25
 Release: 1%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
@@ -8,6 +8,7 @@ License: LGPLv2+
 Url: http://git.0pointer.de/?p=libcanberra.git;a=summary
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gtk2-devel
+BuildRequires: gtk3-devel
 BuildRequires: alsa-lib-devel
 BuildRequires: libvorbis-devel
 BuildRequires: libtool-ltdl-devel
@@ -15,6 +16,7 @@ BuildRequires: gtk-doc
 BuildRequires: pulseaudio-libs-devel >= 0.9.15
 BuildRequires: gstreamer-devel
 BuildRequires: libtdb-devel
+BuildRequires: GConf2
 BuildRequires: GConf2-devel
 BuildRequires: gettext-devel
 Requires: sound-theme-freedesktop
@@ -25,15 +27,25 @@ A small and lightweight implementation of the XDG Sound Theme Specification
 (http://0pointer.de/public/sound-theme-spec.html).
 
 %package gtk2
-Summary: Gtk+ Bindings for libcanberra
+Summary: Gtk+ 2.x Bindings for libcanberra
+Group: System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+# GConf and other stuff is included in the gtk3 package, so always pull that in.
+Requires: %{name}-gtk3 = %{version}-%{release}
+
+%description gtk2
+Gtk+ 2.x bindings for libcanberra
+
+%package gtk3
+Summary: Gtk+ 3.x Bindings for libcanberra
 Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires(pre): GConf2
 Requires(preun): GConf2
 Requires(post): GConf2
 
-%description gtk2
-Gtk+ bindings for libcanberra
+%description gtk3
+Gtk+ 3.x bindings for libcanberra
 
 %package devel
 Summary: Development Files for libcanberra Client Development
@@ -49,26 +61,22 @@ Development Files for libcanberra Client Development
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-%post gtk2
-/sbin/ldconfig
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/libcanberra.schemas > /dev/null || :
-
+%pre gtk2 -p /sbin/ldconfig
+%post gtk2 -p /sbin/ldconfig
+%preun gtk2 -p /sbin/ldconfig
 %postun gtk2 -p /sbin/ldconfig
 
-%pre gtk2
-if [ "$1" -gt 1 ]; then
-	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-	gconftool-2 --makefile-install-rule \
-		%{_sysconfdir}/gconf/schemas/libcanberra.schemas >& /dev/null || :
-fi
+%pre gtk3
+%gconf_schema_prepare libcanberra
 
-%preun gtk2
-if [ "$1" -eq 0 ]; then
-	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-	gconftool-2 --makefile-uninstall-rule \
-      		%{_sysconfdir}/gconf/schemas/libcanberra.schemas >& /dev/null || :
-fi
+%post gtk3
+/sbin/ldconfig
+%gconf_schema_upgrade libcanberra
+
+%preun gtk3
+%gconf_schema_remove libcanberra
+
+%postun gtk3 -p /sbin/ldconfig
 
 %prep
 %setup -q
@@ -79,6 +87,7 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make DESTDIR=$RPM_BUILD_ROOT install
 find $RPM_BUILD_ROOT \( -name *.a -o -name *.la \) -exec rm {} \;
 rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
@@ -101,6 +110,12 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %{_libdir}/libcanberra-gtk.so.*
 %{_libdir}/gtk-2.0/modules/libcanberra-gtk-module.so
+
+%files gtk3
+%defattr(-,root,root)
+%{_libdir}/libcanberra-gtk3.so.*
+%{_libdir}/gtk-3.0/modules/libcanberra-gtk3-module.so
+%{_libdir}/gtk-3.0/modules/libcanberra-gtk-module.so
 %{_bindir}/canberra-gtk-play
 %{_datadir}/gnome/autostart/libcanberra-login-sound.desktop
 %{_datadir}/gnome/shutdown/libcanberra-logout-sound.sh
@@ -117,8 +132,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/canberra-gtk.h
 %{_includedir}/canberra.h
 %{_libdir}/libcanberra-gtk.so
+%{_libdir}/libcanberra-gtk3.so
 %{_libdir}/libcanberra.so
 %{_libdir}/pkgconfig/libcanberra-gtk.pc
+%{_libdir}/pkgconfig/libcanberra-gtk3.pc
 %{_libdir}/pkgconfig/libcanberra.pc
 # co-own these directories to avoid requiring vala
 %dir %{_datadir}/vala
@@ -127,6 +144,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Sun Jun 13 2010 Lennart Poettering <lpoetter@redhat.com> 0.25-1
+- New version 0.25
+
 * Sat Feb 20 2010 Lennart Poettering <lpoetter@redhat.com> 0.23-1
 - New version 0.23
 
@@ -250,4 +270,3 @@ rm -rf $RPM_BUILD_ROOT
 
 * Fri Jun 13 2008 Lennart Poettering <lpoetter@redhat.com> 0.3-1
 - Initial package, based on Colin Guthrie's Mandriva package
-
diff --git a/sources b/sources
index 60fb4b9..b6f9e91 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-83fb2fb7608c77f91904e12a867534fd  libcanberra-0.23.tar.gz
+f1462d0f4b81c36c3baf3f2029b2b4c7  libcanberra-0.25.tar.gz

From 9d55773d445c0a1143868fde786e8ef4fece631d Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Tue, 29 Jun 2010 02:20:39 +0000
Subject: [PATCH 031/102] Rebuild

---
 libcanberra.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index d51118d..784bf3c 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.25
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz
@@ -144,6 +144,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Mon Jun 28 2010 Matthias Clasen <mclasen@redhat.com> 0.25-2
+- Rebuild
+
 * Sun Jun 13 2010 Lennart Poettering <lpoetter@redhat.com> 0.25-1
 - New version 0.25
 

From 39697817f03a4eeb301d6ad6fa1de11daeb70261 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
Date: Wed, 28 Jul 2010 20:45:56 +0000
Subject: [PATCH 032/102] dist-git conversion

---
 .cvsignore => .gitignore |  0
 Makefile                 | 21 ---------------------
 import.log               |  1 -
 3 files changed, 22 deletions(-)
 rename .cvsignore => .gitignore (100%)
 delete mode 100644 Makefile
 delete mode 100644 import.log

diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 4ad9d15..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: libcanberra
-# $Id$
-NAME := libcanberra
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/import.log b/import.log
deleted file mode 100644
index 7bf54a3..0000000
--- a/import.log
+++ /dev/null
@@ -1 +0,0 @@
-libcanberra-0_3-1_fc10:HEAD:libcanberra-0.3-1.fc10.src.rpm:1213637385

From d8ba70ef23b40721b138a02b791ba66befa5b221 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 23 Aug 2010 22:20:36 -0400
Subject: [PATCH 033/102] drop gtk-doc dep

---
 libcanberra.spec | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index 784bf3c..c150d32 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,12 +1,11 @@
 Name: libcanberra
 Version: 0.25
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz
 License: LGPLv2+
 Url: http://git.0pointer.de/?p=libcanberra.git;a=summary
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gtk2-devel
 BuildRequires: gtk3-devel
 BuildRequires: alsa-lib-devel
@@ -51,8 +50,6 @@ Gtk+ 3.x bindings for libcanberra
 Summary: Development Files for libcanberra Client Development
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: pkgconfig
-Requires: gtk-doc
 Requires: gtk2-devel
 
 %description devel
@@ -86,15 +83,11 @@ Development Files for libcanberra Client Development
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make DESTDIR=$RPM_BUILD_ROOT install
 find $RPM_BUILD_ROOT \( -name *.a -o -name *.la \) -exec rm {} \;
 rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %defattr(-,root,root)
 %doc README LGPL
@@ -128,7 +121,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root)
-%doc %{_datadir}/gtk-doc/html/libcanberra
+%doc %{_datadir}/gtk-doc
 %{_includedir}/canberra-gtk.h
 %{_includedir}/canberra.h
 %{_libdir}/libcanberra-gtk.so
@@ -144,6 +137,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Mon Aug 23 2010 Matthias Clasen <mclasen@redhat.com> 0.25-3
+- Co-own /usr/share/gtk-doc (#604379)
+
 * Mon Jun 28 2010 Matthias Clasen <mclasen@redhat.com> 0.25-2
 - Rebuild
 

From 22eb6276e85bc0c9f1c0b87aa60b961857c44c6d Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 4 Oct 2010 20:05:14 +0200
Subject: [PATCH 034/102] New version 0.26

---
 .gitignore       | 1 +
 libcanberra.spec | 7 +++++--
 sources          | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index eeab51b..3948198 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 libcanberra-0.25.tar.gz
+libcanberra-0.26.tar.gz
diff --git a/libcanberra.spec b/libcanberra.spec
index c150d32..3ca4a4f 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
-Version: 0.25
-Release: 3%{?dist}
+Version: 0.26
+Release: 1%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz
@@ -137,6 +137,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Mon Oct 4 2010 Lennart Poettering <lpoetter@redhat.com> 0.26-1
+- New version 0.26
+
 * Mon Aug 23 2010 Matthias Clasen <mclasen@redhat.com> 0.25-3
 - Co-own /usr/share/gtk-doc (#604379)
 
diff --git a/sources b/sources
index b6f9e91..605bf00 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f1462d0f4b81c36c3baf3f2029b2b4c7  libcanberra-0.25.tar.gz
+8ee84e24ce8877be1b54f102f462ca37  libcanberra-0.26.tar.gz

From 1ab3e9097d79a9c8c180ddbe21c409470b58858d Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 4 Oct 2010 20:24:26 +0200
Subject: [PATCH 035/102] Use final 0.26 tarball

---
 libcanberra.spec | 5 ++++-
 sources          | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index 3ca4a4f..f92d0d0 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.26
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz
@@ -137,6 +137,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Mon Oct 4 2010 Lennart Poettering <lpoetter@redhat.com> 0.26-2
+- Use final 0.26 tarball
+
 * Mon Oct 4 2010 Lennart Poettering <lpoetter@redhat.com> 0.26-1
 - New version 0.26
 
diff --git a/sources b/sources
index 605bf00..09d667c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8ee84e24ce8877be1b54f102f462ca37  libcanberra-0.26.tar.gz
+ee2c66ada7c851a4e7b6eb1682285a24  libcanberra-0.26.tar.gz

From 4560fc4f9343567c1598f6a06d18c91f6e00357f Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 1 Nov 2010 22:58:38 -0400
Subject: [PATCH 036/102] rebuild

---
 libcanberra.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index f92d0d0..f400380 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.26
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz
@@ -137,6 +137,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Mon Nov 1 2010 Matthias Clasen <mclasen@redhat.com> 0.26-3
+- Rebuild against newer gtk3
+
 * Mon Oct 4 2010 Lennart Poettering <lpoetter@redhat.com> 0.26-2
 - Use final 0.26 tarball
 

From cb009124475e044f089512635f6518b789d4b0e7 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Fri, 3 Dec 2010 12:00:48 -0500
Subject: [PATCH 037/102] rebuild

---
 libcanberra.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index f400380..e1194a7 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.26
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz
@@ -137,6 +137,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Fri Dec 3 2010 Matthias Clasen <mclasen@redhat.com> 0.26-4
+- Rebuild against new gtk
+
 * Mon Nov 1 2010 Matthias Clasen <mclasen@redhat.com> 0.26-3
 - Rebuild against newer gtk3
 

From 17a18f95f4061200d35bc926ef6c997ec30f074a Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Fri, 7 Jan 2011 22:51:01 -0500
Subject: [PATCH 038/102] Rebuild

---
 libcanberra-quit-add.patch | 24 ++++++++++++++++++++++++
 libcanberra.spec           |  9 ++++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 libcanberra-quit-add.patch

diff --git a/libcanberra-quit-add.patch b/libcanberra-quit-add.patch
new file mode 100644
index 0000000..0094569
--- /dev/null
+++ b/libcanberra-quit-add.patch
@@ -0,0 +1,24 @@
+diff -up libcanberra-0.26/src/canberra-gtk-module.c.quit-add libcanberra-0.26/src/canberra-gtk-module.c
+--- libcanberra-0.26/src/canberra-gtk-module.c.quit-add	2011-01-07 22:48:49.388992626 -0500
++++ libcanberra-0.26/src/canberra-gtk-module.c	2011-01-07 22:49:02.339995153 -0500
+@@ -932,11 +932,6 @@ static void connect_settings(void) {
+         connected = TRUE;
+ }
+ 
+-static gboolean quit_handler(gpointer data) {
+-        dispatch_queue();
+-        return FALSE;
+-}
+-
+ G_MODULE_EXPORT void gtk_module_init(gint *argc, gchar ***argv[]) {
+ 
+         /* This is the same quark libgnomeui uses! */
+@@ -963,8 +958,6 @@ G_MODULE_EXPORT void gtk_module_init(gin
+         install_hook(GTK_TYPE_WIDGET, "drag-drop", &signal_id_widget_drag_drop);
+         install_hook(GTK_TYPE_WIDGET, "drag-failed", &signal_id_widget_drag_failed);
+         install_hook(GTK_TYPE_EXPANDER, "activate", &signal_id_expander_activate);
+-
+-        gtk_quit_add(1, quit_handler, NULL);
+ }
+ 
+ G_MODULE_EXPORT gchar* g_module_check_init(GModule *module);
diff --git a/libcanberra.spec b/libcanberra.spec
index e1194a7..2251024 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,9 +1,12 @@
 Name: libcanberra
 Version: 0.26
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz
+
+Patch0: libcanberra-quit-add.patch
+
 License: LGPLv2+
 Url: http://git.0pointer.de/?p=libcanberra.git;a=summary
 BuildRequires: gtk2-devel
@@ -77,6 +80,7 @@ Development Files for libcanberra Client Development
 
 %prep
 %setup -q
+%patch0 -p1 -b .quit-add
 
 %build
 %configure --disable-static --enable-pulse --enable-alsa --enable-null --enable-gstreamer --disable-oss --with-builtin=dso
@@ -137,6 +141,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Fri Jan  7 2011 Matthias Clasen <mclasen@redhat.com> 0.26-5
+- Rebuild against newer gtk
+
 * Fri Dec 3 2010 Matthias Clasen <mclasen@redhat.com> 0.26-4
 - Rebuild against new gtk
 

From a1d9b00590674f6050f591833912e727692b8670 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 2 Feb 2011 02:18:18 -0500
Subject: [PATCH 039/102] Rebuild

---
 libcanberra.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index 2251024..0a864c6 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.26
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz
@@ -141,6 +141,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Wed Feb  2 2011 Matthias Clasen <mclasen@redhat.com> 0.26-6
+- Rebuild
+
 * Fri Jan  7 2011 Matthias Clasen <mclasen@redhat.com> 0.26-5
 - Rebuild against newer gtk
 

From 97e74d3c62615d3eb21da322f7e5b19719f931ce Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Mon, 7 Feb 2011 22:54:07 -0600
Subject: [PATCH 040/102] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

---
 libcanberra.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index 0a864c6..8042e8f 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.26
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz
@@ -141,6 +141,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.26-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
 * Wed Feb  2 2011 Matthias Clasen <mclasen@redhat.com> 0.26-6
 - Rebuild
 

From 6bcacf8140792cf2e4967232cca52f6513429867 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 10 Feb 2011 19:14:54 -0500
Subject: [PATCH 041/102] rebuild

---
 libcanberra.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index 8042e8f..da67a77 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.26
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz
@@ -141,6 +141,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Thu Feb 10 2011 Matthias Clasen <mclasen@redhat.com> 0.26-8
+- Rebuild against newer gtk
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.26-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 

From faa8cf031cff9c6ac362e8b5010f84b07a658c3f Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 18 Feb 2011 01:43:18 +0100
Subject: [PATCH 042/102] New upstream release

---
 libcanberra.spec | 36 +++++++++++++++++++++++++++++-------
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index da67a77..5274433 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,12 +1,10 @@
 Name: libcanberra
-Version: 0.26
-Release: 8%{?dist}
+Version: 0.27
+Release: 1%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz
 
-Patch0: libcanberra-quit-add.patch
-
 License: LGPLv2+
 Url: http://git.0pointer.de/?p=libcanberra.git;a=summary
 BuildRequires: gtk2-devel
@@ -21,8 +19,13 @@ BuildRequires: libtdb-devel
 BuildRequires: GConf2
 BuildRequires: GConf2-devel
 BuildRequires: gettext-devel
+BuildRequires: libudev-devel
 Requires: sound-theme-freedesktop
 Requires: pulseaudio-libs >= 0.9.15
+Requires: systemd-units
+Requires(post): systemd-units
+Requires(preun): systemd-units
+Requires(postun): systemd-units
 
 %description
 A small and lightweight implementation of the XDG Sound Theme Specification
@@ -58,8 +61,21 @@ Requires: gtk2-devel
 %description devel
 Development Files for libcanberra Client Development
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+if [ $1 -eq 1 ]; then
+        /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+fi
+
+%preun
+if [ $1 -eq 0 ]; then
+        /bin/systemctl --no-reload disable canberra-system-bootup.service canberra-system-shutdown.service canberra-system-shutdown-reboot.service >/dev/null 2>&1 || :
+        /bin/systemctl stop canberra-system-bootup.service canberra-system-shutdown.service canberra-system-shutdown-reboot.service >/dev/null 2>&1 || :
+fi
+
+%postun
+/sbin/ldconfig
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
 
 %pre gtk2 -p /sbin/ldconfig
 %post gtk2 -p /sbin/ldconfig
@@ -80,7 +96,6 @@ Development Files for libcanberra Client Development
 
 %prep
 %setup -q
-%patch0 -p1 -b .quit-add
 
 %build
 %configure --disable-static --enable-pulse --enable-alsa --enable-null --enable-gstreamer --disable-oss --with-builtin=dso
@@ -102,6 +117,10 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_libdir}/libcanberra-%{version}/libcanberra-null.so
 %{_libdir}/libcanberra-%{version}/libcanberra-multi.so
 %{_libdir}/libcanberra-%{version}/libcanberra-gstreamer.so
+/lib/systemd/system/canberra-system-bootup.service
+/lib/systemd/system/canberra-system-shutdown-reboot.service
+/lib/systemd/system/canberra-system-shutdown.service
+%{_bindir}/canberra-boot
 
 %files gtk2
 %defattr(-,root,root)
@@ -141,6 +160,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Fri Feb 18 2011 Lennart Poettering <lpoetter@redhat.com> - 0.27-1
+- New upstream Release
+
 * Thu Feb 10 2011 Matthias Clasen <mclasen@redhat.com> 0.26-8
 - Rebuild against newer gtk
 

From bbb4e725b67d48def4690dd925be3ce755b82ff3 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 18 Feb 2011 01:46:22 +0100
Subject: [PATCH 043/102] new tarball

---
 .gitignore | 8 ++++++--
 sources    | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3948198..4afe165 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,6 @@
-libcanberra-0.25.tar.gz
-libcanberra-0.26.tar.gz
+libcanberra-*.src.rpm
+.build-*.log
+/libcanberra-0.25.tar.gz
+/libcanberra-0.26.tar.gz
+/libcanberra-0.27.tar.gz
+x86_64
diff --git a/sources b/sources
index 09d667c..928eafb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ee2c66ada7c851a4e7b6eb1682285a24  libcanberra-0.26.tar.gz
+1c683f8753074acf9bddf77e2577932d  libcanberra-0.27.tar.gz

From 03126541b29b1b7935e748cd41a83c79da496f26 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 25 Feb 2011 00:35:51 +0100
Subject: [PATCH 044/102] new upstream release

---
 .gitignore       |  1 +
 libcanberra.spec | 31 ++++++++++++++++++-------------
 sources          |  2 +-
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4afe165..1faa9bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ libcanberra-*.src.rpm
 /libcanberra-0.26.tar.gz
 /libcanberra-0.27.tar.gz
 x86_64
+/libcanberra-0.28.tar.gz
diff --git a/libcanberra.spec b/libcanberra.spec
index 5274433..6eca3b2 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,5 +1,5 @@
 Name: libcanberra
-Version: 0.27
+Version: 0.28
 Release: 1%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
@@ -37,6 +37,9 @@ Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
 # GConf and other stuff is included in the gtk3 package, so always pull that in.
 Requires: %{name}-gtk3 = %{version}-%{release}
+Requires(pre): GConf2
+Requires(preun): GConf2
+Requires(post): GConf2
 
 %description gtk2
 Gtk+ 2.x bindings for libcanberra
@@ -45,9 +48,7 @@ Gtk+ 2.x bindings for libcanberra
 Summary: Gtk+ 3.x Bindings for libcanberra
 Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires(pre): GConf2
-Requires(preun): GConf2
-Requires(post): GConf2
+Requires: gnome-settings-daemon
 
 %description gtk3
 Gtk+ 3.x bindings for libcanberra
@@ -77,21 +78,21 @@ fi
 /sbin/ldconfig
 /bin/systemctl daemon-reload >/dev/null 2>&1 || :
 
-%pre gtk2 -p /sbin/ldconfig
-%post gtk2 -p /sbin/ldconfig
-%preun gtk2 -p /sbin/ldconfig
-%postun gtk2 -p /sbin/ldconfig
-
-%pre gtk3
+%pre gtk2
 %gconf_schema_prepare libcanberra
 
-%post gtk3
+%post gtk2
 /sbin/ldconfig
 %gconf_schema_upgrade libcanberra
 
-%preun gtk3
+%preun gtk2
 %gconf_schema_remove libcanberra
 
+%postun gtk2 -p /sbin/ldconfig
+
+%pre gtk3 -p /sbin/ldconfig
+%post gtk3 -p /sbin/ldconfig
+%preun gtk3 -p /sbin/ldconfig
 %postun gtk3 -p /sbin/ldconfig
 
 %prep
@@ -126,6 +127,7 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %defattr(-,root,root)
 %{_libdir}/libcanberra-gtk.so.*
 %{_libdir}/gtk-2.0/modules/libcanberra-gtk-module.so
+%{_sysconfdir}/gconf/schemas/libcanberra.schemas
 
 %files gtk3
 %defattr(-,root,root)
@@ -140,7 +142,7 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %dir %{_datadir}/gdm/autostart/
 %dir %{_datadir}/gdm/autostart/LoginWindow/
 %{_datadir}/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop
-%{_sysconfdir}/gconf/schemas/libcanberra.schemas
+%{_libdir}/gnome-settings-daemon-3.0/gtk-modules/canberra-gtk-module.desktop
 
 %files devel
 %defattr(-,root,root)
@@ -160,6 +162,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Fri Feb 25 2011 Lennart Poettering <lpoetter@redhat.com> - 0.28-1
+- New upstream release
+
 * Fri Feb 18 2011 Lennart Poettering <lpoetter@redhat.com> - 0.27-1
 - New upstream Release
 
diff --git a/sources b/sources
index 928eafb..c0f39f8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1c683f8753074acf9bddf77e2577932d  libcanberra-0.27.tar.gz
+c198b4811598c4c161ff505e4531b02c  libcanberra-0.28.tar.gz

From 0a90da42f65b2bd5546ab1ed78299d27b6433f03 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Tue, 1 Mar 2011 13:42:52 -0500
Subject: [PATCH 045/102] Own the directory so we don't have to require
 gnome-settings-daemon.

---
 libcanberra.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index 6eca3b2..188ce95 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.28
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz
@@ -48,7 +48,6 @@ Gtk+ 2.x bindings for libcanberra
 Summary: Gtk+ 3.x Bindings for libcanberra
 Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: gnome-settings-daemon
 
 %description gtk3
 Gtk+ 3.x bindings for libcanberra
@@ -142,6 +141,7 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %dir %{_datadir}/gdm/autostart/
 %dir %{_datadir}/gdm/autostart/LoginWindow/
 %{_datadir}/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop
+%dir %{_libdir}/gnome-settings-daemon-3.0/gtk-modules
 %{_libdir}/gnome-settings-daemon-3.0/gtk-modules/canberra-gtk-module.desktop
 
 %files devel
@@ -162,6 +162,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Tue Mar  1 2011 Bill Nottingham <notting@redhat.com> - 0.28-2
+- own gnome-settings-daemon desktop dir, don't require g-s-d
+
 * Fri Feb 25 2011 Lennart Poettering <lpoetter@redhat.com> - 0.28-1
 - New upstream release
 

From 94c9190e02f062bef531afcad9c9284f9b4861b8 Mon Sep 17 00:00:00 2001
From: Christopher Aillon <caillon@redhat.com>
Date: Thu, 24 Mar 2011 21:20:23 -0700
Subject: [PATCH 046/102] Workaround a hang

Others were seeing this bug today (dcbw, mccann), so committing this for
now until a better fix can be made upstream.

https://bugs.freedesktop.org/show_bug.cgi?id=35024
---
 ...-a-hang-if-there-are-server-problems.patch | 28 +++++++++++++++++++
 libcanberra.spec                              |  7 ++++-
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 0001-Workaround-a-hang-if-there-are-server-problems.patch

diff --git a/0001-Workaround-a-hang-if-there-are-server-problems.patch b/0001-Workaround-a-hang-if-there-are-server-problems.patch
new file mode 100644
index 0000000..bc84ce3
--- /dev/null
+++ b/0001-Workaround-a-hang-if-there-are-server-problems.patch
@@ -0,0 +1,28 @@
+From 151ddf4a0d6f4db39ccabf78b083a4343623bbc7 Mon Sep 17 00:00:00 2001
+From: Christopher Aillon <caillon@redhat.com>
+Date: Sat, 5 Mar 2011 11:03:31 -0800
+Subject: [PATCH] Workaround a hang if there are server problems
+
+https://bugs.freedesktop.org/show_bug.cgi?id=35024
+---
+ src/pulse.c |    4 ----
+ 1 files changed, 0 insertions(+), 4 deletions(-)
+
+diff --git a/src/pulse.c b/src/pulse.c
+index d4225d1..8b4188b 100644
+--- a/src/pulse.c
++++ b/src/pulse.c
+@@ -312,10 +312,6 @@ static void context_state_cb(pa_context *pc, void *userdata) {
+                         }
+ 
+                         p->subscribed = FALSE;
+-
+-                        /* If we managed to connect once, then let's try to
+-                         * reconnect, and pass NOFAIL */
+-                        context_connect(c, TRUE);
+                 }
+         }
+ 
+-- 
+1.7.4.1
+
diff --git a/libcanberra.spec b/libcanberra.spec
index 188ce95..7b7880d 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,9 +1,10 @@
 Name: libcanberra
 Version: 0.28
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz
+Patch0: 0001-Workaround-a-hang-if-there-are-server-problems.patch
 
 License: LGPLv2+
 Url: http://git.0pointer.de/?p=libcanberra.git;a=summary
@@ -96,6 +97,7 @@ fi
 
 %prep
 %setup -q
+%patch0 -p1 -b .caillon
 
 %build
 %configure --disable-static --enable-pulse --enable-alsa --enable-null --enable-gstreamer --disable-oss --with-builtin=dso
@@ -162,6 +164,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Thu Mar 24 2011 Christopher Aillon <caillon@redhat.com> - 0.28-3
+- Workaround a hang (fdo#35024)
+
 * Tue Mar  1 2011 Bill Nottingham <notting@redhat.com> - 0.28-2
 - own gnome-settings-daemon desktop dir, don't require g-s-d
 

From ba0923ea8f5823d85a63aa46057067f63ca3a747 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Tue, 8 Nov 2011 23:54:50 -0500
Subject: [PATCH 047/102] Rebuild to break bogus libpng dep

---
 libcanberra.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index 7b7880d..d379b4d 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.28
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz
@@ -164,6 +164,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Tue Nov 08 2011 Adam Jackson <ajax@redhat.com> - 0.28-4
+- Rebuild to break bogus libpng dep
+
 * Thu Mar 24 2011 Christopher Aillon <caillon@redhat.com> - 0.28-3
 - Workaround a hang (fdo#35024)
 

From cca8495101c367c72aeaa1579db84f02e986c037 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Fri, 13 Jan 2012 01:26:27 -0600
Subject: [PATCH 048/102] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild

---
 libcanberra.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index d379b4d..529bc87 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.28
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz
@@ -164,6 +164,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.28-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
 * Tue Nov 08 2011 Adam Jackson <ajax@redhat.com> - 0.28-4
 - Rebuild to break bogus libpng dep
 

From ca764ffc823468f349c7f6f56e1b0ece035ea2be Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Thu, 23 Feb 2012 23:52:58 +0000
Subject: [PATCH 049/102] Update systemd service file locations

---
 libcanberra.spec | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index 529bc87..3c504e3 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.28
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz
@@ -119,9 +119,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_libdir}/libcanberra-%{version}/libcanberra-null.so
 %{_libdir}/libcanberra-%{version}/libcanberra-multi.so
 %{_libdir}/libcanberra-%{version}/libcanberra-gstreamer.so
-/lib/systemd/system/canberra-system-bootup.service
-/lib/systemd/system/canberra-system-shutdown-reboot.service
-/lib/systemd/system/canberra-system-shutdown.service
+/usr/lib/systemd/system/canberra-system-bootup.service
+/usr/lib/systemd/system/canberra-system-shutdown-reboot.service
+/usr/lib/systemd/system/canberra-system-shutdown.service
 %{_bindir}/canberra-boot
 
 %files gtk2
@@ -164,6 +164,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Thu Feb 23 2012 Peter Robinson <pbrobinson@fedoraproject.org> - 0.28-6
+- Update systemd service file locations
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.28-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 

From c08c2910083ed3c4c0db818cd324bf478af1a332 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 15 May 2012 12:42:06 +0200
Subject: [PATCH 050/102] new upstream

---
 .gitignore                                    |  8 +--
 ...-a-hang-if-there-are-server-problems.patch | 28 -----------
 libcanberra.spec                              | 50 +++++++------------
 sources                                       |  2 +-
 4 files changed, 24 insertions(+), 64 deletions(-)
 delete mode 100644 0001-Workaround-a-hang-if-there-are-server-problems.patch

diff --git a/.gitignore b/.gitignore
index 1faa9bc..f45f91f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,9 @@
-libcanberra-*.src.rpm
-.build-*.log
+/libcanberra-*.src.rpm
+/.build-*.log
 /libcanberra-0.25.tar.gz
 /libcanberra-0.26.tar.gz
 /libcanberra-0.27.tar.gz
-x86_64
+/x86_64
 /libcanberra-0.28.tar.gz
+/libcanberra-0.*/
+/libcanberra-0.29.tar.xz
diff --git a/0001-Workaround-a-hang-if-there-are-server-problems.patch b/0001-Workaround-a-hang-if-there-are-server-problems.patch
deleted file mode 100644
index bc84ce3..0000000
--- a/0001-Workaround-a-hang-if-there-are-server-problems.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 151ddf4a0d6f4db39ccabf78b083a4343623bbc7 Mon Sep 17 00:00:00 2001
-From: Christopher Aillon <caillon@redhat.com>
-Date: Sat, 5 Mar 2011 11:03:31 -0800
-Subject: [PATCH] Workaround a hang if there are server problems
-
-https://bugs.freedesktop.org/show_bug.cgi?id=35024
----
- src/pulse.c |    4 ----
- 1 files changed, 0 insertions(+), 4 deletions(-)
-
-diff --git a/src/pulse.c b/src/pulse.c
-index d4225d1..8b4188b 100644
---- a/src/pulse.c
-+++ b/src/pulse.c
-@@ -312,10 +312,6 @@ static void context_state_cb(pa_context *pc, void *userdata) {
-                         }
- 
-                         p->subscribed = FALSE;
--
--                        /* If we managed to connect once, then let's try to
--                         * reconnect, and pass NOFAIL */
--                        context_connect(c, TRUE);
-                 }
-         }
- 
--- 
-1.7.4.1
-
diff --git a/libcanberra.spec b/libcanberra.spec
index 3c504e3..eb03aa6 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,10 +1,9 @@
 Name: libcanberra
-Version: 0.28
-Release: 6%{?dist}
+Version: 0.29
+Release: 1%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
-Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz
-Patch0: 0001-Workaround-a-hang-if-there-are-server-problems.patch
+Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz
 
 License: LGPLv2+
 Url: http://git.0pointer.de/?p=libcanberra.git;a=summary
@@ -17,16 +16,14 @@ BuildRequires: gtk-doc
 BuildRequires: pulseaudio-libs-devel >= 0.9.15
 BuildRequires: gstreamer-devel
 BuildRequires: libtdb-devel
-BuildRequires: GConf2
-BuildRequires: GConf2-devel
 BuildRequires: gettext-devel
 BuildRequires: libudev-devel
 Requires: sound-theme-freedesktop
 Requires: pulseaudio-libs >= 0.9.15
 Requires: systemd-units
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
 
 %description
 A small and lightweight implementation of the XDG Sound Theme Specification
@@ -36,11 +33,8 @@ A small and lightweight implementation of the XDG Sound Theme Specification
 Summary: Gtk+ 2.x Bindings for libcanberra
 Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
-# GConf and other stuff is included in the gtk3 package, so always pull that in.
+# Some other stuff is included in the gtk3 package, so always pull that in.
 Requires: %{name}-gtk3 = %{version}-%{release}
-Requires(pre): GConf2
-Requires(preun): GConf2
-Requires(post): GConf2
 
 %description gtk2
 Gtk+ 2.x bindings for libcanberra
@@ -78,33 +72,20 @@ fi
 /sbin/ldconfig
 /bin/systemctl daemon-reload >/dev/null 2>&1 || :
 
-%pre gtk2
-%gconf_schema_prepare libcanberra
-
-%post gtk2
-/sbin/ldconfig
-%gconf_schema_upgrade libcanberra
-
-%preun gtk2
-%gconf_schema_remove libcanberra
-
+%post gtk2 -p /sbin/ldconfig
 %postun gtk2 -p /sbin/ldconfig
 
-%pre gtk3 -p /sbin/ldconfig
 %post gtk3 -p /sbin/ldconfig
-%preun gtk3 -p /sbin/ldconfig
 %postun gtk3 -p /sbin/ldconfig
 
 %prep
 %setup -q
-%patch0 -p1 -b .caillon
 
 %build
 %configure --disable-static --enable-pulse --enable-alsa --enable-null --enable-gstreamer --disable-oss --with-builtin=dso
 make %{?_smp_mflags}
 
 %install
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make DESTDIR=$RPM_BUILD_ROOT install
 find $RPM_BUILD_ROOT \( -name *.a -o -name *.la \) -exec rm {} \;
 rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
@@ -119,16 +100,15 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_libdir}/libcanberra-%{version}/libcanberra-null.so
 %{_libdir}/libcanberra-%{version}/libcanberra-multi.so
 %{_libdir}/libcanberra-%{version}/libcanberra-gstreamer.so
-/usr/lib/systemd/system/canberra-system-bootup.service
-/usr/lib/systemd/system/canberra-system-shutdown-reboot.service
-/usr/lib/systemd/system/canberra-system-shutdown.service
+%{_prefix}/lib/systemd/system/canberra-system-bootup.service
+%{_prefix}/lib/systemd/system/canberra-system-shutdown-reboot.service
+%{_prefix}/lib/systemd/system/canberra-system-shutdown.service
 %{_bindir}/canberra-boot
 
 %files gtk2
 %defattr(-,root,root)
 %{_libdir}/libcanberra-gtk.so.*
 %{_libdir}/gtk-2.0/modules/libcanberra-gtk-module.so
-%{_sysconfdir}/gconf/schemas/libcanberra.schemas
 
 %files gtk3
 %defattr(-,root,root)
@@ -143,7 +123,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %dir %{_datadir}/gdm/autostart/
 %dir %{_datadir}/gdm/autostart/LoginWindow/
 %{_datadir}/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop
-%dir %{_libdir}/gnome-settings-daemon-3.0/gtk-modules
+# co-own these directories to avoid requiring g-s-d
+%dir %{_libdir}/gnome-settings-daemon-3.0/
+%dir %{_libdir}/gnome-settings-daemon-3.0/gtk-modules/
 %{_libdir}/gnome-settings-daemon-3.0/gtk-modules/canberra-gtk-module.desktop
 
 %files devel
@@ -164,6 +146,10 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Tue May 15 2012 Lennart Poettering <lpoetter@redhat.com> - 0.29-1
+- New upstream
+- Closes #744888, #696194
+
 * Thu Feb 23 2012 Peter Robinson <pbrobinson@fedoraproject.org> - 0.28-6
 - Update systemd service file locations
 
diff --git a/sources b/sources
index c0f39f8..25ecf0b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c198b4811598c4c161ff505e4531b02c  libcanberra-0.28.tar.gz
+2594093a5d61047bd9cc87e955f86df8  libcanberra-0.29.tar.xz

From ef40eeae561e64e2e31d1954b97a7dd9bbeff7bd Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 15 May 2012 15:46:12 +0200
Subject: [PATCH 051/102] Various minor .spec file fixes

---
 libcanberra.spec | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index eb03aa6..97f40cd 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.29
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz
@@ -20,7 +20,6 @@ BuildRequires: gettext-devel
 BuildRequires: libudev-devel
 Requires: sound-theme-freedesktop
 Requires: pulseaudio-libs >= 0.9.15
-Requires: systemd-units
 Requires(post): systemd
 Requires(preun): systemd
 Requires(postun): systemd
@@ -82,7 +81,7 @@ fi
 %setup -q
 
 %build
-%configure --disable-static --enable-pulse --enable-alsa --enable-null --enable-gstreamer --disable-oss --with-builtin=dso
+%configure --disable-static --enable-pulse --enable-alsa --enable-null --enable-gstreamer --disable-oss --with-builtin=dso --with-systemdsystemunitdir=/usr/lib/systemd/system
 make %{?_smp_mflags}
 
 %install
@@ -146,6 +145,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Tue May 15 2012 Lennart Poettering <lpoetter@redhat.com> - 0.29-2
+- Various minor .spec file fixes
+
 * Tue May 15 2012 Lennart Poettering <lpoetter@redhat.com> - 0.29-1
 - New upstream
 - Closes #744888, #696194

From 8a7916806d3d2b62d7867af44f50a6befb0560de Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay@vrfy.org>
Date: Tue, 5 Jun 2012 00:45:03 +0200
Subject: [PATCH 052/102] rebuild for libudev1

---
 libcanberra.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index 97f40cd..aae241e 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.29
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz
@@ -17,7 +17,7 @@ BuildRequires: pulseaudio-libs-devel >= 0.9.15
 BuildRequires: gstreamer-devel
 BuildRequires: libtdb-devel
 BuildRequires: gettext-devel
-BuildRequires: libudev-devel
+BuildRequires: systemd-devel
 Requires: sound-theme-freedesktop
 Requires: pulseaudio-libs >= 0.9.15
 Requires(post): systemd
@@ -145,6 +145,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Mon Jun 04 2012 Kay Sievers <kay@redhat.com> - 0.29-3
+- rebuild for libudev1
+
 * Tue May 15 2012 Lennart Poettering <lpoetter@redhat.com> - 0.29-2
 - Various minor .spec file fixes
 

From aa8f23e5bceab8ca1f04ac0f785a0df321ffdc6c Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Thu, 19 Jul 2012 14:22:10 -0500
Subject: [PATCH 053/102] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild

---
 libcanberra.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index aae241e..c653b50 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.29
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz
@@ -145,6 +145,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.29-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
 * Mon Jun 04 2012 Kay Sievers <kay@redhat.com> - 0.29-3
 - rebuild for libudev1
 

From 12c04506c0e0f94dc437d902571c4effd66390d8 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 14 Sep 2012 18:03:14 +0200
Subject: [PATCH 054/102] Use systemd macros

---
 libcanberra.spec | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index c653b50..d69c26d 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.29
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz
@@ -57,19 +57,14 @@ Development Files for libcanberra Client Development
 
 %post
 /sbin/ldconfig
-if [ $1 -eq 1 ]; then
-        /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-fi
+%systemd_post canberra-system-bootup.service canberra-system-shutdown.service canberra-system-shutdown-reboot.service
 
 %preun
-if [ $1 -eq 0 ]; then
-        /bin/systemctl --no-reload disable canberra-system-bootup.service canberra-system-shutdown.service canberra-system-shutdown-reboot.service >/dev/null 2>&1 || :
-        /bin/systemctl stop canberra-system-bootup.service canberra-system-shutdown.service canberra-system-shutdown-reboot.service >/dev/null 2>&1 || :
-fi
+%systemd_preun canberra-system-bootup.service canberra-system-shutdown.service canberra-system-shutdown-reboot.service
 
 %postun
 /sbin/ldconfig
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+%systemd_postun
 
 %post gtk2 -p /sbin/ldconfig
 %postun gtk2 -p /sbin/ldconfig
@@ -145,6 +140,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Fri Sep 14 2012 Lennart Poettering <lpoetter@redhat.com> - 0.29-5
+- Use systemd macros
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.29-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 

From a85292670a00d69157dce574d86a20beb24cf18f Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Mon, 24 Sep 2012 17:52:24 +0200
Subject: [PATCH 055/102] Disable the GStreamer backend, it's not used in
 Fedora

---
 libcanberra.spec | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index d69c26d..a873146 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.29
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz
@@ -14,7 +14,6 @@ BuildRequires: libvorbis-devel
 BuildRequires: libtool-ltdl-devel
 BuildRequires: gtk-doc
 BuildRequires: pulseaudio-libs-devel >= 0.9.15
-BuildRequires: gstreamer-devel
 BuildRequires: libtdb-devel
 BuildRequires: gettext-devel
 BuildRequires: systemd-devel
@@ -76,7 +75,7 @@ Development Files for libcanberra Client Development
 %setup -q
 
 %build
-%configure --disable-static --enable-pulse --enable-alsa --enable-null --enable-gstreamer --disable-oss --with-builtin=dso --with-systemdsystemunitdir=/usr/lib/systemd/system
+%configure --disable-static --enable-pulse --enable-alsa --enable-null --disable-oss --with-builtin=dso --with-systemdsystemunitdir=/usr/lib/systemd/system
 make %{?_smp_mflags}
 
 %install
@@ -93,7 +92,6 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_libdir}/libcanberra-%{version}/libcanberra-pulse.so
 %{_libdir}/libcanberra-%{version}/libcanberra-null.so
 %{_libdir}/libcanberra-%{version}/libcanberra-multi.so
-%{_libdir}/libcanberra-%{version}/libcanberra-gstreamer.so
 %{_prefix}/lib/systemd/system/canberra-system-bootup.service
 %{_prefix}/lib/systemd/system/canberra-system-shutdown-reboot.service
 %{_prefix}/lib/systemd/system/canberra-system-shutdown.service
@@ -140,6 +138,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Mon Sep 24 2012 Bastien Nocera <bnocera@redhat.com> 0.29-6
+- Disable the GStreamer backend, it's not used in Fedora
+
 * Fri Sep 14 2012 Lennart Poettering <lpoetter@redhat.com> - 0.29-5
 - Use systemd macros
 

From 2194d9210c716a1ce98a3b75a1867350c5ef6aae Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Mon, 24 Sep 2012 17:52:24 +0200
Subject: [PATCH 056/102] Disable the GStreamer backend, it's not used in
 Fedora

---
 libcanberra.spec | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index d69c26d..a873146 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.29
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz
@@ -14,7 +14,6 @@ BuildRequires: libvorbis-devel
 BuildRequires: libtool-ltdl-devel
 BuildRequires: gtk-doc
 BuildRequires: pulseaudio-libs-devel >= 0.9.15
-BuildRequires: gstreamer-devel
 BuildRequires: libtdb-devel
 BuildRequires: gettext-devel
 BuildRequires: systemd-devel
@@ -76,7 +75,7 @@ Development Files for libcanberra Client Development
 %setup -q
 
 %build
-%configure --disable-static --enable-pulse --enable-alsa --enable-null --enable-gstreamer --disable-oss --with-builtin=dso --with-systemdsystemunitdir=/usr/lib/systemd/system
+%configure --disable-static --enable-pulse --enable-alsa --enable-null --disable-oss --with-builtin=dso --with-systemdsystemunitdir=/usr/lib/systemd/system
 make %{?_smp_mflags}
 
 %install
@@ -93,7 +92,6 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_libdir}/libcanberra-%{version}/libcanberra-pulse.so
 %{_libdir}/libcanberra-%{version}/libcanberra-null.so
 %{_libdir}/libcanberra-%{version}/libcanberra-multi.so
-%{_libdir}/libcanberra-%{version}/libcanberra-gstreamer.so
 %{_prefix}/lib/systemd/system/canberra-system-bootup.service
 %{_prefix}/lib/systemd/system/canberra-system-shutdown-reboot.service
 %{_prefix}/lib/systemd/system/canberra-system-shutdown.service
@@ -140,6 +138,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Mon Sep 24 2012 Bastien Nocera <bnocera@redhat.com> 0.29-6
+- Disable the GStreamer backend, it's not used in Fedora
+
 * Fri Sep 14 2012 Lennart Poettering <lpoetter@redhat.com> - 0.29-5
 - Use systemd macros
 

From 4e457604b198e733f49094ec74dbb9582bcfbb90 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 25 Sep 2012 02:41:27 +0200
Subject: [PATCH 057/102] New upstream release

---
 .gitignore       |  1 +
 libcanberra.spec | 11 ++++++++---
 sources          |  2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index f45f91f..32e0682 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /libcanberra-0.28.tar.gz
 /libcanberra-0.*/
 /libcanberra-0.29.tar.xz
+/libcanberra-0.30.tar.xz
diff --git a/libcanberra.spec b/libcanberra.spec
index a873146..2a93bbd 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
-Version: 0.29
-Release: 6%{?dist}
+Version: 0.30
+Release: 1%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz
@@ -14,6 +14,7 @@ BuildRequires: libvorbis-devel
 BuildRequires: libtool-ltdl-devel
 BuildRequires: gtk-doc
 BuildRequires: pulseaudio-libs-devel >= 0.9.15
+BuildRequires: gstreamer1-devel
 BuildRequires: libtdb-devel
 BuildRequires: gettext-devel
 BuildRequires: systemd-devel
@@ -75,7 +76,7 @@ Development Files for libcanberra Client Development
 %setup -q
 
 %build
-%configure --disable-static --enable-pulse --enable-alsa --enable-null --disable-oss --with-builtin=dso --with-systemdsystemunitdir=/usr/lib/systemd/system
+%configure --disable-static --enable-pulse --enable-alsa --enable-null --enable-gstreamer --disable-oss --with-builtin=dso --with-systemdsystemunitdir=/usr/lib/systemd/system
 make %{?_smp_mflags}
 
 %install
@@ -92,6 +93,7 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_libdir}/libcanberra-%{version}/libcanberra-pulse.so
 %{_libdir}/libcanberra-%{version}/libcanberra-null.so
 %{_libdir}/libcanberra-%{version}/libcanberra-multi.so
+%{_libdir}/libcanberra-%{version}/libcanberra-gstreamer.so
 %{_prefix}/lib/systemd/system/canberra-system-bootup.service
 %{_prefix}/lib/systemd/system/canberra-system-shutdown-reboot.service
 %{_prefix}/lib/systemd/system/canberra-system-shutdown.service
@@ -138,6 +140,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Tue Sep 25 2012 Lennart Poettering <lpoetter@redhat.com> - 0.30-1
+- New upstream release
+
 * Mon Sep 24 2012 Bastien Nocera <bnocera@redhat.com> 0.29-6
 - Disable the GStreamer backend, it's not used in Fedora
 
diff --git a/sources b/sources
index 25ecf0b..2025f13 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2594093a5d61047bd9cc87e955f86df8  libcanberra-0.29.tar.xz
+34cb7e4430afaf6f447c4ebdb9b42072  libcanberra-0.30.tar.xz

From a9d23b5bfee4c2f6603e5ac646f1a988e41aa8ba Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 29 Oct 2012 22:37:52 -0400
Subject: [PATCH 058/102] 0.30

---
 .gitignore       |  1 +
 libcanberra.spec | 16 ++++++++++------
 sources          |  2 +-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index f45f91f..32e0682 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /libcanberra-0.28.tar.gz
 /libcanberra-0.*/
 /libcanberra-0.29.tar.xz
+/libcanberra-0.30.tar.xz
diff --git a/libcanberra.spec b/libcanberra.spec
index a873146..991d6cb 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
-Version: 0.29
-Release: 6%{?dist}
+Version: 0.30
+Release: 1%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz
@@ -30,9 +30,9 @@ A small and lightweight implementation of the XDG Sound Theme Specification
 %package gtk2
 Summary: Gtk+ 2.x Bindings for libcanberra
 Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 # Some other stuff is included in the gtk3 package, so always pull that in.
-Requires: %{name}-gtk3 = %{version}-%{release}
+Requires: %{name}-gtk3%{?_isa} = %{version}-%{release}
 
 %description gtk2
 Gtk+ 2.x bindings for libcanberra
@@ -40,7 +40,7 @@ Gtk+ 2.x bindings for libcanberra
 %package gtk3
 Summary: Gtk+ 3.x Bindings for libcanberra
 Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 
 %description gtk3
 Gtk+ 3.x bindings for libcanberra
@@ -48,7 +48,7 @@ Gtk+ 3.x bindings for libcanberra
 %package devel
 Summary: Development Files for libcanberra Client Development
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: gtk2-devel
 
 %description devel
@@ -138,6 +138,10 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Mon Oct 29 2012 Matthias Clasen <mclasen@redhat.com> - 0.30-1
+- Update to 0.30
+- Add %%{_isa} as required to fix multilib issues
+
 * Mon Sep 24 2012 Bastien Nocera <bnocera@redhat.com> 0.29-6
 - Disable the GStreamer backend, it's not used in Fedora
 
diff --git a/sources b/sources
index 25ecf0b..2025f13 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2594093a5d61047bd9cc87e955f86df8  libcanberra-0.29.tar.xz
+34cb7e4430afaf6f447c4ebdb9b42072  libcanberra-0.30.tar.xz

From c169ed03514dfacccfe002dec935579452739c8c Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 29 Oct 2012 22:43:21 -0400
Subject: [PATCH 059/102] fix multilib issue

---
 libcanberra.spec | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index 2a93bbd..f41f953 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.30
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz
@@ -31,9 +31,9 @@ A small and lightweight implementation of the XDG Sound Theme Specification
 %package gtk2
 Summary: Gtk+ 2.x Bindings for libcanberra
 Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 # Some other stuff is included in the gtk3 package, so always pull that in.
-Requires: %{name}-gtk3 = %{version}-%{release}
+Requires: %{name}-gtk3%{?_isa} = %{version}-%{release}
 
 %description gtk2
 Gtk+ 2.x bindings for libcanberra
@@ -41,7 +41,7 @@ Gtk+ 2.x bindings for libcanberra
 %package gtk3
 Summary: Gtk+ 3.x Bindings for libcanberra
 Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 
 %description gtk3
 Gtk+ 3.x bindings for libcanberra
@@ -49,7 +49,7 @@ Gtk+ 3.x bindings for libcanberra
 %package devel
 Summary: Development Files for libcanberra Client Development
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: gtk2-devel
 
 %description devel
@@ -140,6 +140,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Mon Oct 29 2012 Matthias Clasen <mclasen@redhat.com> - 0.30-2
+- Add %%{_isa} as required to fix multilib issues
+
 * Tue Sep 25 2012 Lennart Poettering <lpoetter@redhat.com> - 0.30-1
 - New upstream release
 

From 3e30dd5142ad6309ce48cd4405b321eca7b01097 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Sun, 30 Dec 2012 20:44:15 +0000
Subject: [PATCH 060/102] fix dates and build

---
 libcanberra.spec | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index 114d0ca..f388f30 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -93,6 +93,7 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_libdir}/libcanberra-%{version}/libcanberra-pulse.so
 %{_libdir}/libcanberra-%{version}/libcanberra-null.so
 %{_libdir}/libcanberra-%{version}/libcanberra-multi.so
+%{_libdir}/libcanberra-%{version}/libcanberra-gstreamer.so
 %{_prefix}/lib/systemd/system/canberra-system-bootup.service
 %{_prefix}/lib/systemd/system/canberra-system-shutdown-reboot.service
 %{_prefix}/lib/systemd/system/canberra-system-shutdown.service
@@ -243,7 +244,7 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 * Wed Sep 16 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> 0.17-2
 - Don't require gdm in -gtk2 (#522998)
 
-* Fri Sep 12 2009 Lennart Poettering <lpoetter@redhat.com> 0.17-1
+* Fri Sep 11 2009 Lennart Poettering <lpoetter@redhat.com> 0.17-1
 - New version 0.17
 
 * Thu Aug 27 2009 Lennart Poettering <lpoetter@redhat.com> 0.16-1
@@ -300,7 +301,7 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 * Mon Oct 6 2008 Lennart Poettering <lpoetter@redhat.com> 0.10-1
 - New version
 
-* Thu Sep 9 2008 Lennart Poettering <lpoetter@redhat.com> 0.9-1
+* Tue Sep 9 2008 Lennart Poettering <lpoetter@redhat.com> 0.9-1
 - New version
 
 * Thu Aug 28 2008 Lennart Poettering <lpoetter@redhat.com> 0.8-2

From c2936c1ef78ae50e826d43a7b035cccb113dc453 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Wed, 13 Feb 2013 22:05:57 -0600
Subject: [PATCH 061/102] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild

---
 libcanberra.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index f388f30..2044da3 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.30
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz
@@ -140,6 +140,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.30-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
 * Mon Oct 29 2012 Matthias Clasen <mclasen@redhat.com> - 0.30-2
 - Update to 0.30
 - Add %%{_isa} as required to fix multilib issues

From be368f6cf7d631c7cfcfe1fc53ab602dcd61cd6f Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Fri, 2 Aug 2013 23:57:18 -0500
Subject: [PATCH 062/102] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild

---
 libcanberra.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index 2044da3..d9fd67b 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.30
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz
@@ -140,6 +140,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.30-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.30-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 

From 7f631fb1a4afbacc98d8e412c3b06ef02516f274 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 19 May 2014 09:56:32 -0400
Subject: [PATCH 063/102] Drop hardcoded X11 assumption

---
 ...-all-GdkDisplays-are-GdkX11Displays-.patch | 70 +++++++++++++++++++
 libcanberra.spec                              |  8 ++-
 2 files changed, 77 insertions(+), 1 deletion(-)
 create mode 100644 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch

diff --git a/0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch b/0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch
new file mode 100644
index 0000000..6187900
--- /dev/null
+++ b/0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch
@@ -0,0 +1,70 @@
+From c0620e432650e81062c1967cc669829dbd29b310 Mon Sep 17 00:00:00 2001
+From: Michael Meeks <michael.meeks@suse.com>
+Date: Fri, 9 Nov 2012 16:16:40 +0000
+Subject: [PATCH] gtk: Don't assume all GdkDisplays are GdkX11Displays:
+ broadway/wayland
+
+---
+ src/canberra-gtk-module.c | 15 +++++++++++++++
+ src/canberra-gtk.c        |  5 +++++
+ 2 files changed, 20 insertions(+)
+
+diff --git a/src/canberra-gtk-module.c b/src/canberra-gtk-module.c
+index 67791f0..c1532ab 100644
+--- a/src/canberra-gtk-module.c
++++ b/src/canberra-gtk-module.c
+@@ -307,6 +307,11 @@ static gint window_get_desktop(GdkDisplay *d, GdkWindow *w) {
+         guchar *data = NULL;
+         gint ret = -1;
+ 
++#ifdef GDK_IS_X11_DISPLAY
++        if (!GDK_IS_X11_DISPLAY(d))
++                return 0;
++#endif
++
+         if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), GDK_WINDOW_XID(w),
+                                gdk_x11_get_xatom_by_name_for_display(d, "_NET_WM_DESKTOP"),
+                                0, G_MAXLONG, False, XA_CARDINAL, &type_return,
+@@ -335,6 +340,11 @@ static gint display_get_desktop(GdkDisplay *d) {
+         guchar *data = NULL;
+         gint ret = -1;
+ 
++#ifdef GDK_IS_X11_DISPLAY
++        if (!GDK_IS_X11_DISPLAY(d))
++                return 0;
++#endif
++
+         if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), DefaultRootWindow(GDK_DISPLAY_XDISPLAY(d)),
+                                gdk_x11_get_xatom_by_name_for_display(d, "_NET_CURRENT_DESKTOP"),
+                                0, G_MAXLONG, False, XA_CARDINAL, &type_return,
+@@ -365,6 +375,11 @@ static gboolean window_is_xembed(GdkDisplay *d, GdkWindow *w) {
+         gboolean ret = FALSE;
+         Atom xembed;
+ 
++#ifdef GDK_IS_X11_DISPLAY
++        if (!GDK_IS_X11_DISPLAY(d))
++                return FALSE;
++#endif
++
+         /* Gnome Panel applets are XEMBED windows. We need to make sure we
+          * ignore them */
+ 
+diff --git a/src/canberra-gtk.c b/src/canberra-gtk.c
+index 34446f5..08cb668 100644
+--- a/src/canberra-gtk.c
++++ b/src/canberra-gtk.c
+@@ -185,6 +185,11 @@ static gint window_get_desktop(GdkDisplay *d, GdkWindow *w) {
+         guchar *data = NULL;
+         gint ret = -1;
+ 
++#ifdef GDK_IS_X11_DISPLAY
++        if (!GDK_IS_X11_DISPLAY(d))
++                return 0;
++#endif
++
+         if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), GDK_WINDOW_XID(w),
+                                gdk_x11_get_xatom_by_name_for_display(d, "_NET_WM_DESKTOP"),
+                                0, G_MAXLONG, False, XA_CARDINAL, &type_return,
+-- 
+1.9.0
+
diff --git a/libcanberra.spec b/libcanberra.spec
index d9fd67b..d9da7f5 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,10 +1,12 @@
 Name: libcanberra
 Version: 0.30
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz
 
+Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch
+
 License: LGPLv2+
 Url: http://git.0pointer.de/?p=libcanberra.git;a=summary
 BuildRequires: gtk2-devel
@@ -74,6 +76,7 @@ Development Files for libcanberra Client Development
 
 %prep
 %setup -q
+%patch0 -p1 
 
 %build
 %configure --disable-static --enable-pulse --enable-alsa --enable-null --disable-oss --with-builtin=dso --with-systemdsystemunitdir=/usr/lib/systemd/system
@@ -140,6 +143,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Mon May 19 2014 Matthias Clasen <mclasen@redhat.com> - 0.30-5
+- Add an upstream patch to drop hardcoded X11 assumptions
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.30-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 

From 54c2f825575733129c1d71108386c9264a4d5ef7 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Fri, 6 Jun 2014 21:45:52 -0500
Subject: [PATCH 064/102] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

---
 libcanberra.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index d9da7f5..8002bc1 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.30
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz
@@ -143,6 +143,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.30-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
 * Mon May 19 2014 Matthias Clasen <mclasen@redhat.com> - 0.30-5
 - Add an upstream patch to drop hardcoded X11 assumptions
 

From a4e994d6031b5ae7512f79ae5e5399c975c0ba05 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@fedoraproject.org>
Date: Sun, 17 Aug 2014 02:28:58 +0000
Subject: [PATCH 065/102] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild

---
 libcanberra.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index 8002bc1..4ed4641 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.30
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz
@@ -143,6 +143,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.30-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.30-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 

From 70b0fbd253acdcc6d3ba774e76086268ad8c610e Mon Sep 17 00:00:00 2001
From: Till Maas <opensource@till.name>
Date: Sat, 21 Feb 2015 22:26:59 +0100
Subject: [PATCH 066/102] Rebuilt for Fedora 23 Change

  https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code
---
 libcanberra.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index 4ed4641..eb869f3 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.30
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz
@@ -143,6 +143,10 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Sat Feb 21 2015 Till Maas <opensource@till.name> - 0.30-8
+- Rebuilt for Fedora 23 Change
+  https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code
+
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.30-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 

From ea8ea34cfc96ad7f735231db26ea9ab31455743a Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Sat, 28 Feb 2015 20:05:03 -0700
Subject: [PATCH 067/102] Try and fix devel package not pulling in the right
 things in rawhide

---
 libcanberra.spec | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index eb869f3..f6078e2 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.30
-Release: 8%{?dist}
+Release: 9%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz
@@ -52,6 +52,8 @@ Gtk+ 3.x bindings for libcanberra
 Summary: Development Files for libcanberra Client Development
 Group: Development/Libraries
 Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: %{name}-gtk2%{?_isa} = %{version}-%{release}
+Requires: %{name}-gtk3%{?_isa} = %{version}-%{release}
 Requires: gtk2-devel
 
 %description devel
@@ -143,6 +145,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Sat Feb 28 2015 Kevin Fenzi <kevin@scrye.com> 0.30-9
+- Try and fix devel package not pulling in the right things in rawhide
+
 * Sat Feb 21 2015 Till Maas <opensource@till.name> - 0.30-8
 - Rebuilt for Fedora 23 Change
   https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code

From c034f9da4832a465ea314fa9aa9972e5fc4638c8 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Wed, 17 Jun 2015 14:59:30 +0000
Subject: [PATCH 068/102] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild

---
 libcanberra.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index f6078e2..537b6ac 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.30
-Release: 9%{?dist}
+Release: 10%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz
@@ -145,6 +145,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.30-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
 * Sat Feb 28 2015 Kevin Fenzi <kevin@scrye.com> 0.30-9
 - Try and fix devel package not pulling in the right things in rawhide
 

From 11e699d60c722d0e94f1600a8c2e18ba996cd04c Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Thu, 4 Feb 2016 02:57:16 +0000
Subject: [PATCH 069/102] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild

---
 libcanberra.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index 537b6ac..dc0c228 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.30
-Release: 10%{?dist}
+Release: 11%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz
@@ -145,6 +145,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.30-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 

From 0bc580215ced5aa60e58051c42188b5cd9c842c1 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@cora.nwra.com>
Date: Fri, 2 Dec 2016 07:38:06 -0700
Subject: [PATCH 070/102] Rebuild for libtdb 1.3.12

- Drop %defattr
- Use %license
---
 libcanberra.spec | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index dc0c228..7f8f256 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.30
-Release: 11%{?dist}
+Release: 12%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz
@@ -90,7 +90,7 @@ find $RPM_BUILD_ROOT \( -name *.a -o -name *.la \) -exec rm {} \;
 rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 
 %files
-%defattr(-,root,root)
+%license LGPL
 %doc README LGPL
 %{_libdir}/libcanberra.so.*
 %dir %{_libdir}/libcanberra-%{version}
@@ -105,12 +105,10 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_bindir}/canberra-boot
 
 %files gtk2
-%defattr(-,root,root)
 %{_libdir}/libcanberra-gtk.so.*
 %{_libdir}/gtk-2.0/modules/libcanberra-gtk-module.so
 
 %files gtk3
-%defattr(-,root,root)
 %{_libdir}/libcanberra-gtk3.so.*
 %{_libdir}/gtk-3.0/modules/libcanberra-gtk3-module.so
 %{_libdir}/gtk-3.0/modules/libcanberra-gtk-module.so
@@ -128,7 +126,6 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_libdir}/gnome-settings-daemon-3.0/gtk-modules/canberra-gtk-module.desktop
 
 %files devel
-%defattr(-,root,root)
 %doc %{_datadir}/gtk-doc
 %{_includedir}/canberra-gtk.h
 %{_includedir}/canberra.h
@@ -145,6 +142,11 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Fri Dec 02 2016 Orion Poplawski <orion@cora.nwra.com> - 0.30-12
+- Rebuild for libtdb 1.3.12
+- Drop %%defattr
+- Use %%license
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 

From 75c2540c09e8c27ba6fead173d5091f47dd5dde5 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 10 Feb 2017 18:26:09 +0000
Subject: [PATCH 071/102] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild

---
 libcanberra.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index 7f8f256..1b02523 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.30
-Release: 12%{?dist}
+Release: 13%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz
@@ -142,6 +142,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
 * Fri Dec 02 2016 Orion Poplawski <orion@cora.nwra.com> - 0.30-12
 - Rebuild for libtdb 1.3.12
 - Drop %%defattr

From fd9c097bd200cd894887c852e7b4b55c886f75e4 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 26 Jul 2017 18:35:50 +0000
Subject: [PATCH 072/102] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild

---
 libcanberra.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index 1b02523..5205f25 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.30
-Release: 13%{?dist}
+Release: 14%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz
@@ -142,6 +142,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 

From 697979f388e4d8ac63235c771b4a3f33f326d56a Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 3 Aug 2017 01:14:32 +0000
Subject: [PATCH 073/102] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild

---
 libcanberra.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index 5205f25..784e659 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.30
-Release: 14%{?dist}
+Release: 15%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz
@@ -142,6 +142,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
 * Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 

From bcaac7d852147d6e66ec1c6ba8a334f934b9dc92 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 7 Feb 2018 21:17:36 +0000
Subject: [PATCH 074/102] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 libcanberra.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index 784e659..a14f822 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.30
-Release: 15%{?dist}
+Release: 16%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz
@@ -142,6 +142,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
 * Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
 

From b969e213d61b4a3872ab4edaa93f0f818f5b7cdc Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenko@redhat.com>
Date: Mon, 9 Jul 2018 19:06:47 +0200
Subject: [PATCH 075/102] add BuildRequires: gcc

Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot
---
 libcanberra.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libcanberra.spec b/libcanberra.spec
index a14f822..e2a0c8b 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -9,6 +9,7 @@ Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch
 
 License: LGPLv2+
 Url: http://git.0pointer.de/?p=libcanberra.git;a=summary
+BuildRequires:  gcc
 BuildRequires: gtk2-devel
 BuildRequires: gtk3-devel
 BuildRequires: alsa-lib-devel

From bc55346b82d5ebaf53bed3647785d21a085408d8 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 13 Jul 2018 07:52:33 +0000
Subject: [PATCH 076/102] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 libcanberra.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index e2a0c8b..ca55d41 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.30
-Release: 16%{?dist}
+Release: 17%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz
@@ -143,6 +143,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 

From 91f8686f05f7fd7fae5d07dd9c078291ff7a00ec Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Tue, 22 Jan 2019 18:39:34 +0100
Subject: [PATCH 077/102] Remove obsolete ldconfig scriptlets

References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
 libcanberra.spec | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index ca55d41..50b0f76 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -61,21 +61,19 @@ Requires: gtk2-devel
 Development Files for libcanberra Client Development
 
 %post
-/sbin/ldconfig
+%{?ldconfig}
 %systemd_post canberra-system-bootup.service canberra-system-shutdown.service canberra-system-shutdown-reboot.service
 
 %preun
 %systemd_preun canberra-system-bootup.service canberra-system-shutdown.service canberra-system-shutdown-reboot.service
 
 %postun
-/sbin/ldconfig
+%{?ldconfig_
 %systemd_postun
 
-%post gtk2 -p /sbin/ldconfig
-%postun gtk2 -p /sbin/ldconfig
+%ldconfig_scriptlets gtk2
 
-%post gtk3 -p /sbin/ldconfig
-%postun gtk3 -p /sbin/ldconfig
+%ldconfig_scriptlets gtk3
 
 %prep
 %setup -q

From 939b00c168071cd163464babc4c807a9bfb0e578 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Mon, 28 Jan 2019 20:17:51 +0100
Subject: [PATCH 078/102] Remove obsolete Group tag

References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
---
 libcanberra.spec | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index 50b0f76..bf152f1 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -2,7 +2,6 @@ Name: libcanberra
 Version: 0.30
 Release: 17%{?dist}
 Summary: Portable Sound Event Library
-Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz
 
 Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch
@@ -33,7 +32,6 @@ A small and lightweight implementation of the XDG Sound Theme Specification
 
 %package gtk2
 Summary: Gtk+ 2.x Bindings for libcanberra
-Group: System Environment/Libraries
 Requires: %{name}%{?_isa} = %{version}-%{release}
 # Some other stuff is included in the gtk3 package, so always pull that in.
 Requires: %{name}-gtk3%{?_isa} = %{version}-%{release}
@@ -43,7 +41,6 @@ Gtk+ 2.x bindings for libcanberra
 
 %package gtk3
 Summary: Gtk+ 3.x Bindings for libcanberra
-Group: System Environment/Libraries
 Requires: %{name}%{?_isa} = %{version}-%{release}
 
 %description gtk3
@@ -51,7 +48,6 @@ Gtk+ 3.x bindings for libcanberra
 
 %package devel
 Summary: Development Files for libcanberra Client Development
-Group: Development/Libraries
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: %{name}-gtk2%{?_isa} = %{version}-%{release}
 Requires: %{name}-gtk3%{?_isa} = %{version}-%{release}

From d9891ebcde4f748c6ab381a2678c8fa1734212e3 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 1 Feb 2019 06:46:31 +0000
Subject: [PATCH 079/102] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 libcanberra.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index bf152f1..b64fab0 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.30
-Release: 17%{?dist}
+Release: 18%{?dist}
 Summary: Portable Sound Event Library
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz
 
@@ -137,6 +137,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 

From d69fc37f931389094d5ee75dc98c0588cf2be0cf Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Tue, 12 Feb 2019 12:40:11 +0100
Subject: [PATCH 080/102] Fix typo in postun

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
 libcanberra.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index b64fab0..a976b7a 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.30
-Release: 18%{?dist}
+Release: 19%{?dist}
 Summary: Portable Sound Event Library
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz
 
@@ -64,7 +64,7 @@ Development Files for libcanberra Client Development
 %systemd_preun canberra-system-bootup.service canberra-system-shutdown.service canberra-system-shutdown-reboot.service
 
 %postun
-%{?ldconfig_
+%{?ldconfig}
 %systemd_postun
 
 %ldconfig_scriptlets gtk2
@@ -137,6 +137,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Tue Feb 12 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.30-19
+- Fix typo in postun
+
 * Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org>
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 

From b6fab3c714b2e033cea723d2cea88337d51ad427 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 25 Jul 2019 12:53:56 +0000
Subject: [PATCH 081/102] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 libcanberra.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index a976b7a..613dd74 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.30
-Release: 19%{?dist}
+Release: 20%{?dist}
 Summary: Portable Sound Event Library
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz
 
@@ -137,6 +137,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Tue Feb 12 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.30-19
 - Fix typo in postun
 

From 8da8f91f0f913f0ca2f7481e81ed37663ae34d28 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot@fedoraproject.org>
Date: Fri, 8 Nov 2019 11:43:32 -0500
Subject: [PATCH 082/102] remove %%systemd_postun macro to fix FTBFS

---
 libcanberra.spec | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index 613dd74..8edbec7 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,14 +1,12 @@
 Name: libcanberra
 Version: 0.30
-Release: 20%{?dist}
+Release: 21%{?dist}
 Summary: Portable Sound Event Library
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz
-
 Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch
-
 License: LGPLv2+
 Url: http://git.0pointer.de/?p=libcanberra.git;a=summary
-BuildRequires:  gcc
+BuildRequires: gcc
 BuildRequires: gtk2-devel
 BuildRequires: gtk3-devel
 BuildRequires: alsa-lib-devel
@@ -63,9 +61,7 @@ Development Files for libcanberra Client Development
 %preun
 %systemd_preun canberra-system-bootup.service canberra-system-shutdown.service canberra-system-shutdown-reboot.service
 
-%postun
-%{?ldconfig}
-%systemd_postun
+%ldconfig_postun
 
 %ldconfig_scriptlets gtk2
 
@@ -137,6 +133,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Fri Nov  8 2019 Tom Callaway <spot@fedoraproject.org> - 0.30-21
+- remove %%systemd_postun macro to fix FTBFS
+
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 

From eacd18055219c25a78c40e481d04e4746dabb293 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 29 Jan 2020 08:42:11 +0000
Subject: [PATCH 083/102] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 libcanberra.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index 8edbec7..a200261 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.30
-Release: 21%{?dist}
+Release: 22%{?dist}
 Summary: Portable Sound Event Library
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz
 Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch
@@ -133,6 +133,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-22
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
 * Fri Nov  8 2019 Tom Callaway <spot@fedoraproject.org> - 0.30-21
 - remove %%systemd_postun macro to fix FTBFS
 

From 26651c2d61debc58db053290ed840912c90d2e03 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Tue, 28 Jul 2020 04:19:58 +0000
Subject: [PATCH 084/102] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 libcanberra.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index a200261..f4aa8a4 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.30
-Release: 22%{?dist}
+Release: 23%{?dist}
 Summary: Portable Sound Event Library
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz
 Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch
@@ -133,6 +133,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-22
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 

From facc3fa810f0831de0f17bb2b1bc3fefe0d78384 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar@redhat.com>
Date: Tue, 5 Jan 2021 01:30:08 +0000
Subject: [PATCH 085/102] Add BuildRequires: make

https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
---
 libcanberra.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libcanberra.spec b/libcanberra.spec
index f4aa8a4..374009c 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -18,6 +18,7 @@ BuildRequires: gstreamer1-devel
 BuildRequires: libtdb-devel
 BuildRequires: gettext-devel
 BuildRequires: systemd-devel
+BuildRequires: make
 Requires: sound-theme-freedesktop
 Requires: pulseaudio-libs >= 0.9.15
 Requires(post): systemd

From 49987b84525fdad70900f5d3db53fd2a0a439dd2 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Tue, 26 Jan 2021 16:44:56 +0000
Subject: [PATCH 086/102] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 libcanberra.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index 374009c..a21fa49 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.30
-Release: 23%{?dist}
+Release: 24%{?dist}
 Summary: Portable Sound Event Library
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz
 Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch
@@ -134,6 +134,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-24
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-23
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 

From 22e5da24b0aea84347120ce31d766b1a233455d4 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 22 Jul 2021 11:02:46 +0000
Subject: [PATCH 087/102] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 libcanberra.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index a21fa49..6df8827 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.30
-Release: 24%{?dist}
+Release: 25%{?dist}
 Summary: Portable Sound Event Library
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz
 Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch
@@ -134,6 +134,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-25
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-24
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 

From a16560540f7d008b2ae1981dfcb0d19285606698 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Fri, 1 Oct 2021 13:09:44 +0200
Subject: [PATCH 088/102] Avoid requiring systemd as per updated packaging
 guidelines

There is no need to require systemd for the systemd scriptlets as
systemd correctly handles reloading depending on the transaction
ordering (even if systemd is installed _after_ the package that installs
the unit file).
---
 libcanberra.spec | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index 6df8827..db7420d 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.30
-Release: 25%{?dist}
+Release: 26%{?dist}
 Summary: Portable Sound Event Library
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz
 Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch
@@ -21,9 +21,6 @@ BuildRequires: systemd-devel
 BuildRequires: make
 Requires: sound-theme-freedesktop
 Requires: pulseaudio-libs >= 0.9.15
-Requires(post): systemd
-Requires(preun): systemd
-Requires(postun): systemd
 
 %description
 A small and lightweight implementation of the XDG Sound Theme Specification
@@ -134,6 +131,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Fri Oct 01 2021 Kalev Lember <klember@redhat.com> - 0.30-26
+- Avoid requiring systemd as per updated packaging guidelines
+
 * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-25
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 

From 859b4716c966e14f661e545a5b4b9dd2c664163f Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Fri, 1 Oct 2021 13:11:00 +0200
Subject: [PATCH 089/102] Drop ldconfig scriptlets

They are noop these days.
---
 libcanberra.spec | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index db7420d..5abef8e 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -53,18 +53,11 @@ Requires: gtk2-devel
 Development Files for libcanberra Client Development
 
 %post
-%{?ldconfig}
 %systemd_post canberra-system-bootup.service canberra-system-shutdown.service canberra-system-shutdown-reboot.service
 
 %preun
 %systemd_preun canberra-system-bootup.service canberra-system-shutdown.service canberra-system-shutdown-reboot.service
 
-%ldconfig_postun
-
-%ldconfig_scriptlets gtk2
-
-%ldconfig_scriptlets gtk3
-
 %prep
 %setup -q
 %patch0 -p1 
@@ -133,6 +126,7 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %changelog
 * Fri Oct 01 2021 Kalev Lember <klember@redhat.com> - 0.30-26
 - Avoid requiring systemd as per updated packaging guidelines
+- Drop ldconfig scriptlets
 
 * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-25
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

From 6dd04456bf92c63613282d9d73dc4a3611257038 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 20 Jan 2022 15:51:43 +0000
Subject: [PATCH 090/102] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 libcanberra.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index 5abef8e..c071066 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.30
-Release: 26%{?dist}
+Release: 27%{?dist}
 Summary: Portable Sound Event Library
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz
 Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch
@@ -124,6 +124,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-27
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
 * Fri Oct 01 2021 Kalev Lember <klember@redhat.com> - 0.30-26
 - Avoid requiring systemd as per updated packaging guidelines
 - Drop ldconfig scriptlets

From 8321a12330209c06b9e9a28f1a835c1cce1d6beb Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Sun, 6 Feb 2022 18:45:51 +0100
Subject: [PATCH 091/102] + libcanberra-0.30-27

Update X11 avoidance patch
---
 ...-all-GdkDisplays-are-GdkX11Displays-.patch | 63 +++++++++++++++++--
 libcanberra.spec                              |  6 +-
 2 files changed, 63 insertions(+), 6 deletions(-)

diff --git a/0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch b/0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch
index 6187900..763c3a9 100644
--- a/0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch
+++ b/0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch
@@ -1,13 +1,14 @@
-From c0620e432650e81062c1967cc669829dbd29b310 Mon Sep 17 00:00:00 2001
+From d6dd5cdf45c1aac6c0519c8a4f5f89321770fb53 Mon Sep 17 00:00:00 2001
 From: Michael Meeks <michael.meeks@suse.com>
 Date: Fri, 9 Nov 2012 16:16:40 +0000
 Subject: [PATCH] gtk: Don't assume all GdkDisplays are GdkX11Displays:
  broadway/wayland
 
+Co-Authored-By: Bastien Nocera <hadess@hadess.net>
 ---
  src/canberra-gtk-module.c | 15 +++++++++++++++
- src/canberra-gtk.c        |  5 +++++
- 2 files changed, 20 insertions(+)
+ src/canberra-gtk.c        | 28 ++++++++++++++++++++++------
+ 2 files changed, 37 insertions(+), 6 deletions(-)
 
 diff --git a/src/canberra-gtk-module.c b/src/canberra-gtk-module.c
 index 67791f0..c1532ab 100644
@@ -50,7 +51,7 @@ index 67791f0..c1532ab 100644
           * ignore them */
  
 diff --git a/src/canberra-gtk.c b/src/canberra-gtk.c
-index 34446f5..08cb668 100644
+index 34446f5..47285f8 100644
 --- a/src/canberra-gtk.c
 +++ b/src/canberra-gtk.c
 @@ -185,6 +185,11 @@ static gint window_get_desktop(GdkDisplay *d, GdkWindow *w) {
@@ -65,6 +66,58 @@ index 34446f5..08cb668 100644
          if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), GDK_WINDOW_XID(w),
                                 gdk_x11_get_xatom_by_name_for_display(d, "_NET_WM_DESKTOP"),
                                 0, G_MAXLONG, False, XA_CARDINAL, &type_return,
+@@ -254,18 +259,28 @@ int ca_gtk_proplist_set_for_widget(ca_proplist *p, GtkWidget *widget) {
+ 
+         if (gtk_widget_get_realized(GTK_WIDGET(w))) {
+                 GdkWindow *dw = NULL;
++#ifdef GDK_IS_X11_DISPLAY
+                 GdkScreen *screen = NULL;
++#endif
+                 GdkDisplay *display = NULL;
+                 gint x = -1, y = -1, width = -1, height = -1, screen_width = -1, screen_height = -1;
+ 
+-                if ((dw = gtk_widget_get_window(GTK_WIDGET(w))))
+-                        if ((ret = ca_proplist_setf(p, CA_PROP_WINDOW_X11_XID, "%lu", (unsigned long) GDK_WINDOW_XID(dw))) < 0)
+-                                return ret;
++                if ((dw = gtk_widget_get_window(GTK_WIDGET(w)))) {
++#ifdef GDK_IS_X11_DISPLAY
++                        if (GDK_IS_X11_DISPLAY(display)) {
++                                if ((ret = ca_proplist_setf(p, CA_PROP_WINDOW_X11_XID, "%lu", (unsigned long) GDK_WINDOW_XID(dw))) < 0)
++                                        return ret;
++                        }
++#endif
++                }
+ 
+                 if ((display = gtk_widget_get_display(GTK_WIDGET(w)))) {
+-                        if ((t = gdk_display_get_name(display)))
++#ifdef GDK_IS_X11_DISPLAY
++                        if (GDK_IS_X11_DISPLAY(display) && (t = gdk_display_get_name(display))) {
+                                 if ((ret = ca_proplist_sets(p, CA_PROP_WINDOW_X11_DISPLAY, t)) < 0)
+                                         return ret;
++                        }
++#endif
+ 
+                         if (dw)  {
+                                 gint desktop = window_get_desktop(display, dw);
+@@ -276,7 +291,8 @@ int ca_gtk_proplist_set_for_widget(ca_proplist *p, GtkWidget *widget) {
+                         }
+                 }
+ 
+-                if ((screen = gtk_widget_get_screen(GTK_WIDGET(w)))) {
++#ifdef GDK_IS_X11_DISPLAY
++                if (GDK_IS_X11_DISPLAY(display) && (screen = gtk_widget_get_screen(GTK_WIDGET(w)))) {
+ 
+                         if ((ret = ca_proplist_setf(p, CA_PROP_WINDOW_X11_SCREEN, "%i", gdk_screen_get_number(screen))) < 0)
+                                 return ret;
+@@ -285,7 +301,7 @@ int ca_gtk_proplist_set_for_widget(ca_proplist *p, GtkWidget *widget) {
+                                 if ((ret = ca_proplist_setf(p, CA_PROP_WINDOW_X11_MONITOR, "%i", gdk_screen_get_monitor_at_window(screen, dw))) < 0)
+                                         return ret;
+                 }
+-
++#endif
+                 /* FIXME, this might cause a round trip */
+ 
+                 if (dw) {
 -- 
-1.9.0
+2.34.1
 
diff --git a/libcanberra.spec b/libcanberra.spec
index c071066..377ed3c 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.30
-Release: 27%{?dist}
+Release: 28%{?dist}
 Summary: Portable Sound Event Library
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz
 Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch
@@ -124,6 +124,10 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Sun Feb 06 2022 Bastien Nocera <bnocera@redhat.com> - 0.30-28
++ libcanberra-0.30-27
+- Update X11 avoidance patch
+
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-27
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 

From 461f39a003c02e71ec9964a6b77673e631001aa8 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 21 Jul 2022 17:25:15 +0000
Subject: [PATCH 092/102] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 libcanberra.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index 377ed3c..c3c3742 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.30
-Release: 28%{?dist}
+Release: 29%{?dist}
 Summary: Portable Sound Event Library
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz
 Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch
@@ -124,6 +124,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-29
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Sun Feb 06 2022 Bastien Nocera <bnocera@redhat.com> - 0.30-28
 + libcanberra-0.30-27
 - Update X11 avoidance patch

From a25d1b641853dee397e2771efef95b5d926eb9ce Mon Sep 17 00:00:00 2001
From: Tomas Popela <tpopela@redhat.com>
Date: Tue, 10 Jan 2023 15:24:23 +0100
Subject: [PATCH 093/102] Don't build GTK 2 bits on ELN/RHEL 10

GTK 2 won't be part of RHEL 10, see the following announcements:

https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/KH2BKEOZTLV4G6WF5FUXU6RYDPC62UEX/
https://github.com/minimization/content-resolver-input/pull/724
https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/9.1_release_notes/deprecated_functionality#deprecated-functionality_desktop
---
 libcanberra.spec | 44 +++++++++++++++++++++++++++++++++++++-------
 1 file changed, 37 insertions(+), 7 deletions(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index c3c3742..c6b99a8 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,13 +1,22 @@
+# RHEL 10 won't ship with GTK 2, don't build bit there, but build them elsewhere
+%if 0%{?rhel} > 9
+%bcond_with gtk2
+%else
+%bcond_without gtk2
+%endif
+
 Name: libcanberra
 Version: 0.30
-Release: 29%{?dist}
+Release: 30%{?dist}
 Summary: Portable Sound Event Library
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz
 Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch
 License: LGPLv2+
 Url: http://git.0pointer.de/?p=libcanberra.git;a=summary
 BuildRequires: gcc
+%if %{with gtk2}
 BuildRequires: gtk2-devel
+%endif
 BuildRequires: gtk3-devel
 BuildRequires: alsa-lib-devel
 BuildRequires: libvorbis-devel
@@ -26,6 +35,7 @@ Requires: pulseaudio-libs >= 0.9.15
 A small and lightweight implementation of the XDG Sound Theme Specification
 (http://0pointer.de/public/sound-theme-spec.html).
 
+%if %{with gtk2}
 %package gtk2
 Summary: Gtk+ 2.x Bindings for libcanberra
 Requires: %{name}%{?_isa} = %{version}-%{release}
@@ -34,6 +44,7 @@ Requires: %{name}-gtk3%{?_isa} = %{version}-%{release}
 
 %description gtk2
 Gtk+ 2.x bindings for libcanberra
+%endif
 
 %package gtk3
 Summary: Gtk+ 3.x Bindings for libcanberra
@@ -45,9 +56,11 @@ Gtk+ 3.x bindings for libcanberra
 %package devel
 Summary: Development Files for libcanberra Client Development
 Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: %{name}-gtk2%{?_isa} = %{version}-%{release}
 Requires: %{name}-gtk3%{?_isa} = %{version}-%{release}
+%if %{with gtk2}
+Requires: %{name}-gtk2%{?_isa} = %{version}-%{release}
 Requires: gtk2-devel
+%endif
 
 %description devel
 Development Files for libcanberra Client Development
@@ -63,7 +76,17 @@ Development Files for libcanberra Client Development
 %patch0 -p1 
 
 %build
-%configure --disable-static --enable-pulse --enable-alsa --enable-null --disable-oss --with-builtin=dso --with-systemdsystemunitdir=/usr/lib/systemd/system
+%configure \
+    --disable-static \
+    --enable-pulse \
+    --enable-alsa \
+%if %{without gtk2}
+    --disable-gtk \
+%endif
+    --enable-null \
+    --disable-oss \
+    --with-builtin=dso \
+    --with-systemdsystemunitdir=/usr/lib/systemd/system
 make %{?_smp_mflags}
 
 %install
@@ -86,9 +109,11 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_prefix}/lib/systemd/system/canberra-system-shutdown.service
 %{_bindir}/canberra-boot
 
+%if %{with gtk2}
 %files gtk2
 %{_libdir}/libcanberra-gtk.so.*
 %{_libdir}/gtk-2.0/modules/libcanberra-gtk-module.so
+%endif
 
 %files gtk3
 %{_libdir}/libcanberra-gtk3.so.*
@@ -111,12 +136,14 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %doc %{_datadir}/gtk-doc
 %{_includedir}/canberra-gtk.h
 %{_includedir}/canberra.h
-%{_libdir}/libcanberra-gtk.so
-%{_libdir}/libcanberra-gtk3.so
 %{_libdir}/libcanberra.so
-%{_libdir}/pkgconfig/libcanberra-gtk.pc
-%{_libdir}/pkgconfig/libcanberra-gtk3.pc
 %{_libdir}/pkgconfig/libcanberra.pc
+%if %{with gtk2}
+%{_libdir}/libcanberra-gtk.so
+%{_libdir}/pkgconfig/libcanberra-gtk.pc
+%endif
+%{_libdir}/libcanberra-gtk3.so
+%{_libdir}/pkgconfig/libcanberra-gtk3.pc
 # co-own these directories to avoid requiring vala
 %dir %{_datadir}/vala
 %dir %{_datadir}/vala/vapi
@@ -124,6 +151,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Tue Jan 10 2023 Tomas Popela <tpopela@redhat.com> - 0.30-30
+- Don't build GTK 2 bits on ELN/RHEL 10 as GTK 2 won't be there
+
 * Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-29
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 

From e0a79493cd9c32309fed94bb507ea807cd29151c Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 19 Jan 2023 15:56:41 +0000
Subject: [PATCH 094/102] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 libcanberra.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index c6b99a8..dba30f8 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -7,7 +7,7 @@
 
 Name: libcanberra
 Version: 0.30
-Release: 30%{?dist}
+Release: 31%{?dist}
 Summary: Portable Sound Event Library
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz
 Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch
@@ -151,6 +151,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-31
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
 * Tue Jan 10 2023 Tomas Popela <tpopela@redhat.com> - 0.30-30
 - Don't build GTK 2 bits on ELN/RHEL 10 as GTK 2 won't be there
 

From a02eae378ba421ead4a7621cc7951deac2b547ed Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 20 Jul 2023 10:26:05 +0000
Subject: [PATCH 095/102] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 libcanberra.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index dba30f8..e4e2ee8 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -7,7 +7,7 @@
 
 Name: libcanberra
 Version: 0.30
-Release: 31%{?dist}
+Release: 32%{?dist}
 Summary: Portable Sound Event Library
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz
 Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch
@@ -151,6 +151,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-32
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
 * Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-31
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 

From b26434df48d4002ffacc9dba40187c2cadf3bae6 Mon Sep 17 00:00:00 2001
From: Niels De Graef <ndegraef@redhat.com>
Date: Fri, 13 Oct 2023 09:47:38 +0200
Subject: [PATCH 096/102] Migrate to SPDX license

---
 libcanberra.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index e4e2ee8..b098db7 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -7,11 +7,11 @@
 
 Name: libcanberra
 Version: 0.30
-Release: 32%{?dist}
+Release: 33%{?dist}
 Summary: Portable Sound Event Library
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz
 Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch
-License: LGPLv2+
+License: LGPL-2.1-or-later
 Url: http://git.0pointer.de/?p=libcanberra.git;a=summary
 BuildRequires: gcc
 %if %{with gtk2}
@@ -151,6 +151,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Fri Oct 13 2023 Niels De Graef <ndegraef@redhat.com> - 0.30-33
+- Migrate to SPDX license
+
 * Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-32
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 

From 086bbc76021a41cf630effcd8d72b0a299b0993b Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sun, 21 Jan 2024 03:42:01 +0000
Subject: [PATCH 097/102] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 libcanberra.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index b098db7..7f27de8 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -7,7 +7,7 @@
 
 Name: libcanberra
 Version: 0.30
-Release: 33%{?dist}
+Release: 34%{?dist}
 Summary: Portable Sound Event Library
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz
 Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch
@@ -151,6 +151,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-34
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Fri Oct 13 2023 Niels De Graef <ndegraef@redhat.com> - 0.30-33
 - Migrate to SPDX license
 

From da7f34cf62e6aabac9687313a4a1d0862c12c7fb Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 25 Jan 2024 01:39:29 +0000
Subject: [PATCH 098/102] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 libcanberra.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index 7f27de8..5cd748a 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -7,7 +7,7 @@
 
 Name: libcanberra
 Version: 0.30
-Release: 34%{?dist}
+Release: 35%{?dist}
 Summary: Portable Sound Event Library
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz
 Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch
@@ -151,6 +151,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-35
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-34
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From 4e8fff5d7d3a947fb368055368ad2dcdc99a077f Mon Sep 17 00:00:00 2001
From: Software Management Team <packaging-team-maint@redhat.com>
Date: Thu, 30 May 2024 12:46:47 +0200
Subject: [PATCH 099/102] Eliminate use of obsolete %patchN syntax (#2283636)

---
 libcanberra.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index 5cd748a..67b6d8b 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -73,7 +73,7 @@ Development Files for libcanberra Client Development
 
 %prep
 %setup -q
-%patch0 -p1 
+%patch -P0 -p1 
 
 %build
 %configure \

From 1d15da375397d306a8500657f06c58e003366734 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 18 Jul 2024 13:27:38 +0000
Subject: [PATCH 100/102] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

---
 libcanberra.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index 67b6d8b..1894a5d 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -7,7 +7,7 @@
 
 Name: libcanberra
 Version: 0.30
-Release: 35%{?dist}
+Release: 36%{?dist}
 Summary: Portable Sound Event Library
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz
 Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch
@@ -151,6 +151,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-36
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
 * Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-35
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From 0df2bfea15d7a2189c9dabf84f145670c427b795 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 17 Jan 2025 10:45:26 +0000
Subject: [PATCH 101/102] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild

---
 libcanberra.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index 1894a5d..50cecaf 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -7,7 +7,7 @@
 
 Name: libcanberra
 Version: 0.30
-Release: 36%{?dist}
+Release: 37%{?dist}
 Summary: Portable Sound Event Library
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz
 Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch
@@ -151,6 +151,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-37
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
 * Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-36
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
 

From 29c011d17386df273f015256edd4c06530b6ebe1 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 24 Jul 2025 19:25:40 +0000
Subject: [PATCH 102/102] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

---
 libcanberra.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libcanberra.spec b/libcanberra.spec
index 50cecaf..e3834df 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -7,7 +7,7 @@
 
 Name: libcanberra
 Version: 0.30
-Release: 37%{?dist}
+Release: 38%{?dist}
 Summary: Portable Sound Event Library
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz
 Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch
@@ -151,6 +151,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-38
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
 * Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-37
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild