New version 0.25; gtk3 support

.cvsignore

@@ -1 +1 @@
-libcanberra-0.23.tar.gz
+libcanberra-0.25.tar.gz

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
+%description gtk3
-Gtk+ bindings for libcanberra
+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
+%pre gtk2 -p /sbin/ldconfig
-/sbin/ldconfig
+%post gtk2 -p /sbin/ldconfig
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+%preun gtk2 -p /sbin/ldconfig
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/libcanberra.schemas > /dev/null || :
-
 %postun gtk2 -p /sbin/ldconfig
 
-%pre gtk2
+%pre gtk3
-if [ "$1" -gt 1 ]; then
+%gconf_schema_prepare libcanberra
-	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-	gconftool-2 --makefile-install-rule \
-		%{_sysconfdir}/gconf/schemas/libcanberra.schemas >& /dev/null || :
-fi
 
-%preun gtk2
+%post gtk3
-if [ "$1" -eq 0 ]; then
+/sbin/ldconfig
-	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+%gconf_schema_upgrade libcanberra
-	gconftool-2 --makefile-uninstall-rule \
+
-      		%{_sysconfdir}/gconf/schemas/libcanberra.schemas >& /dev/null || :
+%preun gtk3
-fi
+%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
-

sources

@@ -1 +1 @@
-83fb2fb7608c77f91904e12a867534fd  libcanberra-0.23.tar.gz
+f1462d0f4b81c36c3baf3f2029b2b4c7  libcanberra-0.25.tar.gz