From 03126541b29b1b7935e748cd41a83c79da496f26 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Feb 24 2011 23:35:51 +0000
Subject: new upstream release


---

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