new upstream

.gitignore

@@ -1,7 +1,9 @@
-libcanberra-*.src.rpm
+/libcanberra-*.src.rpm
-.build-*.log
+/.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

0001-Workaround-a-hang-if-there-are-server-problems.patch

@@ -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
-

libcanberra.spec

@@ -1,10 +1,9 @@
 Name: libcanberra
-Version: 0.28
+Version: 0.29
-Release: 6%{?dist}
+Release: 1%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
-Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz
+Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz
-Patch0: 0001-Workaround-a-hang-if-there-are-server-problems.patch
 
 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(post): systemd
-Requires(preun): systemd-units
+Requires(preun): systemd
-Requires(postun): systemd-units
+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
+%post gtk2 -p /sbin/ldconfig
-%gconf_schema_prepare libcanberra
-
-%post gtk2
-/sbin/ldconfig
-%gconf_schema_upgrade libcanberra
-
-%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
 %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
+%{_prefix}/lib/systemd/system/canberra-system-bootup.service
-/usr/lib/systemd/system/canberra-system-shutdown-reboot.service
+%{_prefix}/lib/systemd/system/canberra-system-shutdown-reboot.service
-/usr/lib/systemd/system/canberra-system-shutdown.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
 

sources

@@ -1 +1 @@
-c198b4811598c4c161ff505e4531b02c  libcanberra-0.28.tar.gz
+2594093a5d61047bd9cc87e955f86df8  libcanberra-0.29.tar.xz