SPECS: libcanberra.spec - updated to 0.11 - removed libcanberra-xinit.sh si...

[megabajt]

Author: megabajt                     Date: Sat Feb 14 16:57:33 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 0.11
- removed libcanberra-xinit.sh since the gconf stuff is supported just fine 
  in current gnome-settings-daemon

---- Files affected:
SPECS:
   libcanberra.spec (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: SPECS/libcanberra.spec
diff -u SPECS/libcanberra.spec:1.11 SPECS/libcanberra.spec:1.12
--- SPECS/libcanberra.spec:1.11	Fri Nov  7 19:54:52 2008
+++ SPECS/libcanberra.spec	Sat Feb 14 17:57:28 2009
@@ -2,22 +2,21 @@
 Summary:	libcanberra - the portable sound event library
 Summary(pl.UTF-8):	libcanberra - przenośna biblioteka zdarzeń dźwiękowych
 Name:		libcanberra
-Version:	0.9
-Release:	3
+Version:	0.11
+Release:	1
 License:	LGPL v2+
 Group:		Libraries
 Source0:	http://0pointer.de/lennart/projects/libcanberra/%{name}-%{version}.tar.gz
-# Source0-md5:	1c6c63d5461e6a1ae443a124d49f8fb6
-Source1:	%{name}-xinit.sh
+# Source0-md5:	c661db14cb0b1fe9b6963defacc3bba6
 URL:		http://0pointer.de/lennart/projects/libcanberra/
 BuildRequires:	alsa-lib-devel >= 1.0.0
-BuildRequires:	autoconf >= 2.62
-BuildRequires:	automake >= 1:1.9
+BuildRequires:	autoconf >= 2.63
+BuildRequires:	automake >= 1:1.10
 BuildRequires:	gstreamer-devel >= 0.10.15
 BuildRequires:	gtk+2-devel >= 2:2.13.4
 BuildRequires:	gtk-doc >= 1.9
 BuildRequires:	libltdl-devel
-BuildRequires:	libtool
+BuildRequires:	libtool >= 2:2.2.0
 BuildRequires:	libvorbis-devel
 BuildRequires:	pkgconfig
 BuildRequires:	pulseaudio-devel >= 0.9.11-1
@@ -25,6 +24,8 @@
 Requires:	sound-theme-freedesktop
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		backenddir	%{_libdir}/libcanberra-%{version}
+
 %description
 A small and lightweight implementation of the XDG Sound Theme
 Specification (http://0pointer.de/public/sound-theme-spec.html).
@@ -113,6 +114,7 @@
 Summary:	Files required to play login sound in GNOME
 Summary(pl.UTF-8):	Pliki potrzebne do odtwarzania dźwięku logowania w GNOME
 Group:		Applications
+Requires(post,preun):	GConf2
 Requires:	%{name}-gtk = %{version}-%{release}
 
 %description gnome
@@ -131,6 +133,7 @@
 %{__autoheader}
 %{__automake}
 %configure \
+	--disable-schemas-install \
 	--disable-ltdl-install \
 	--disable-rpath \
 	--enable-alsa \
@@ -138,21 +141,19 @@
 	--enable-null \
 	--enable-oss \
 	--enable-pulse \
+	--enable-static \
 	--with-html-dir=%{_gtkdocdir}
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/libcanberra.sh
-
 rm $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/*.{a,la}
-rm $RPM_BUILD_ROOT%{_libdir}/libcanberra/libcanberra-multi.so
-rm $RPM_BUILD_ROOT%{_libdir}/libcanberra/*.{a,la}
+rm $RPM_BUILD_ROOT%{backenddir}/*.{a,la}
+rm $RPM_BUILD_ROOT%{_datadir}/doc/libcanberra/README
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -163,17 +164,24 @@
 %post	gtk -p /sbin/ldconfig
 %postun	gtk -p /sbin/ldconfig
 
+%post gnome
+%gconf_schema_install libcanberra.schemas
+
+%preun gnome
+%gconf_schema_uninstall libcanberra.schemas
+
 %files
 %defattr(644,root,root,755)
 %doc README
 %attr(755,root,root) %{_libdir}/libcanberra.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libcanberra.so.0
-%dir %{_libdir}/libcanberra
-%attr(755,root,root) %{_libdir}/libcanberra/libcanberra-alsa.so
-%attr(755,root,root) %{_libdir}/libcanberra/libcanberra-gstreamer.so
-%attr(755,root,root) %{_libdir}/libcanberra/libcanberra-oss.so
-%attr(755,root,root) %{_libdir}/libcanberra/libcanberra-pulse.so
-%attr(755,root,root) %{_libdir}/libcanberra/libcanberra-null.so
+%dir %{backenddir}
+%attr(755,root,root) %{backenddir}/libcanberra-alsa.so
+%attr(755,root,root) %{backenddir}/libcanberra-gstreamer.so
+%attr(755,root,root) %{backenddir}/libcanberra-oss.so
+%attr(755,root,root) %{backenddir}/libcanberra-pulse.so
+%attr(755,root,root) %{backenddir}/libcanberra-null.so
+%attr(755,root,root) %{backenddir}/libcanberra-multi.so
 
 %files devel
 %defattr(644,root,root,755)
@@ -192,7 +200,6 @@
 %attr(755,root,root) %{_libdir}/libcanberra-gtk.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libcanberra-gtk.so.0
 %attr(755,root,root) %{_libdir}/gtk-2.0/modules/libcanberra-gtk-module.so
-%attr(755,root,root) /etc/X11/xinit/xinitrc.d/libcanberra.sh
 
 %files gtk-devel
 %defattr(644,root,root,755)
@@ -211,6 +218,7 @@
 
 %files gnome
 %defattr(644,root,root,755)
+%{_sysconfdir}/gconf/schemas/libcanberra.schemas
 %{_datadir}/gnome/autostart/libcanberra-login-sound.desktop
 %attr(755,root,root) %{_datadir}/gnome/shutdown/libcanberra-logout-sound.sh
 
@@ -220,6 +228,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2009/02/14 16:57:28  megabajt
+- updated to 0.11
+- removed libcanberra-xinit.sh since the gconf stuff is supported just fine
+  in current gnome-settings-daemon
+
 Revision 1.11  2008/11/07 18:54:52  megabajt
 - release 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/libcanberra.spec?r1=1.11&r2=1.12&f=u