diff --git a/baselibs.conf b/baselibs.conf index a2d1440..5436fd0 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,4 +1,7 @@ libcanberra0 libcanberra-gtk0 -libcanberra-gtk - supplements "packageand(libcanberra-gtk:gtk2-)" +libcanberra-gtk3-0 +libcanberra-gtk2-module + supplements "packageand(libcanberra0:gtk2-)" +libcanberra-gtk3-module + supplements "packageand(libcanberra0:gtk3-)" diff --git a/libcanberra-0.24.tar.bz2 b/libcanberra-0.24.tar.bz2 deleted file mode 100644 index 614bb50..0000000 --- a/libcanberra-0.24.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a1b97c649cde4365df8b100ca7ee82c1a73eb8578c12341020c8cf5816c1f713 -size 359552 diff --git a/libcanberra-0.25.tar.bz2 b/libcanberra-0.25.tar.bz2 new file mode 100644 index 0000000..5f435ce --- /dev/null +++ b/libcanberra-0.25.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d07cdcc059386a5f8b60bbf44327874601e0fbdd0c416ca13582f2719819d53d +size 363401 diff --git a/libcanberra.changes b/libcanberra.changes index 141eca6..7757249 100644 --- a/libcanberra.changes +++ b/libcanberra.changes @@ -1,3 +1,43 @@ +------------------------------------------------------------------- +Mon Aug 9 11:25:04 CEST 2010 - vuntz@opensuse.org + +- Disable the build of the GTK+ 3 support: with it, + canberra-gtk-play is built against GTK+ 3, which is something we + don't want to have at the moment. This is done with a define, so + it's easy to re-enable the GTK+ 3 support. + +------------------------------------------------------------------- +Thu Jul 22 10:19:07 CEST 2010 - vuntz@opensuse.org + +- Improve summaries and descriptions. +- Change alsa-devel, gstreamer-0_10-devel, gtk2-devel, gtk3-devel, + libpulse-devel, libvorbis-devel BuildRequires to pkgconfig() + BuildRequires for: alsa, gstreamer-0.10, gtk+-2.0, gtk+-3.0, + libpulse, vorbisfile. +- Remove explicit Requires of libcanberra0 in libcanberra-gtk0. +- Split libcanberra-gtk in libcanberra-gtk-module-common, + libcanberra-gtk2-module and canberra-gtk-play subpackages. +- Rename libcanberra-gtk3 to libcanberra-gtk3-module. +- Make libcanberra-gtk2-module and libcanberra-gtk3-module depend + on libcanberra-gtk-module-common, and add Supplements to install + them when libcanberra0 and gtk2/gtk3 are installed. +- Add Provides/Obsoletes for libcanberra-gtk to canberra-gtk-play, + and add Supplements for gnome-session and gdm there too since + this package provides login sound. +- Remove gtk-doc and gtk2-devel Requires in devel package: gtk-doc + is not needed and gtk2 will be automatically added with + pkgconfig() Requires. + +------------------------------------------------------------------- +Tue Jul 13 16:37:13 CEST 2010 - dimstar@opensuse.org + +- Update to version 0.25: + + gtk: optionally build for both gtk2 and gtk3 + + cache: don't use destructors unless running in valgrind + + build fixes +- Add gtk3-devel BuildRequires. +- Create gtk3-0 and gtk3 subpackages for GTK+ 3 support. + ------------------------------------------------------------------- Sun May 9 21:53:46 CEST 2010 - dimstar@opensuse.org diff --git a/libcanberra.spec b/libcanberra.spec index 2d74914..a0f7ee5 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,5 +1,5 @@ # -# spec file for package libcanberra (Version 0.24) +# spec file for package libcanberra (Version 0.25) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -16,9 +16,10 @@ # +%define build_gtk3 0 Name: libcanberra -Version: 0.24 +Version: 0.25 Release: 1 License: LGPLv2.0+ Summary: Portable sound event library @@ -27,18 +28,27 @@ Group: System/Libraries Source: libcanberra-%{version}.tar.bz2 Source1: libcanberra-gtk-module.sh Source99: baselibs.conf -BuildRequires: alsa-devel BuildRequires: gconf2-devel -BuildRequires: gstreamer-0_10-devel BuildRequires: gtk-doc -BuildRequires: gtk2-devel -BuildRequires: libpulse-devel >= 0.9.11 -BuildRequires: libvorbis-devel BuildRequires: lynx BuildRequires: update-desktop-files +BuildRequires: pkgconfig(alsa) +BuildRequires: pkgconfig(gstreamer-0.10) +BuildRequires: pkgconfig(gtk+-2.0) +%if %build_gtk3 +BuildRequires: pkgconfig(gtk+-3.0) +%endif +BuildRequires: pkgconfig(libpulse) >= 0.9.11 +BuildRequires: pkgconfig(vorbisfile) BuildRoot: %{_tmppath}/%{name}-%{version}-build %define debug_package_requires libcanberra0 = %{version}-%{release} +%description +libcanberra is an implementation of the XDG Sound Theme and Name +Specifications, for generating event sounds on free desktops, such as +GNOME. It comes with several backends (ALSA, PulseAudio, null) and is +designed to be portable. + %package -n libcanberra0 License: LGPLv2.0+ Summary: Portable sound event library @@ -46,97 +56,136 @@ Group: System/Libraries Requires: libpulse0 >= 0.9.11 Requires: sound-theme-freedesktop -%description -libcanberra is an implementation of the XDG Sound Theme and Name -Specifications, for generating event sounds on free desktops, such as -GNOME. It comes with several backends (ALSA, PulseAudio, null) and is -designed to be portable. It consists of the following parts: - -1. 1. libcanberra: the main library - -2. 2. libcanberra-gtk: some glue code to make it easier to use - libcanberra from Gtk+ applications - -3. 3. libcanberra-gtk-module: a Gtk+ module that uses libcanberra-gtk to -trigger input feedback event sounds - %description -n libcanberra0 libcanberra is an implementation of the XDG Sound Theme and Name Specifications, for generating event sounds on free desktops, such as GNOME. It comes with several backends (ALSA, PulseAudio, null) and is -designed to be portable. It consists of the following parts: +designed to be portable. -1. 1. libcanberra: the main library - -2. 2. libcanberra-gtk: some glue code to make it easier to use - libcanberra from Gtk+ applications - -3. 3. libcanberra-gtk-module: a Gtk+ module that uses libcanberra-gtk to -trigger input feedback event sounds +This package contains the main library. %package gtk0 License: LGPLv2.0+ -Summary: Portable sound event library +Summary: Portable sound event library -- GTK+ 2 Library Group: System/Libraries -Requires: libcanberra0 = %{version} %description gtk0 libcanberra is an implementation of the XDG Sound Theme and Name Specifications, for generating event sounds on free desktops, such as GNOME. It comes with several backends (ALSA, PulseAudio, null) and is -designed to be portable. It consists of the following parts: +designed to be portable. -1. 1. libcanberra: the main library +This package contains a library to make it easier to use +libcanberra from GTK+ 2 applications. -2. 2. libcanberra-gtk: some glue code to make it easier to use - libcanberra from Gtk+ applications +%if %build_gtk3 -3. 3. libcanberra-gtk-module: a Gtk+ module that uses libcanberra-gtk to -trigger input feedback event sounds +%package gtk3-0 -%package gtk -License: LGPLv2.0+ -Summary: Portable sound event library +Summary: Portable sound event library -- GTK+ 3 Library Group: System/Libraries -Requires: libcanberra0 = %{version} -%gconf_schemas_prereq -%description gtk +%description gtk3-0 libcanberra is an implementation of the XDG Sound Theme and Name Specifications, for generating event sounds on free desktops, such as GNOME. It comes with several backends (ALSA, PulseAudio, null) and is designed to be portable. It consists of the following parts: -1. 1. libcanberra: the main library +This package contains a library to make it easier to use +libcanberra from GTK+ 3 applications. +%endif -2. 2. libcanberra-gtk: some glue code to make it easier to use - libcanberra from Gtk+ applications +%package gtk-module-common +License: LGPLv2.0+ +Summary: Portable sound event library -- Common Files for GTK+ Modules +Group: System/Libraries +Recommends: %{name}-gtk2-module +%if %build_gtk3 +Recommends: %{name}-gtk3-module +%endif +BuildArch: noarch +%gconf_schemas_prereq -3. 3. libcanberra-gtk-module: a Gtk+ module that uses libcanberra-gtk to -trigger input feedback event sounds +%description gtk-module-common +libcanberra is an implementation of the XDG Sound Theme and Name +Specifications, for generating event sounds on free desktops, such as +GNOME. It comes with several backends (ALSA, PulseAudio, null) and is +designed to be portable. It consists of the following parts: + +This package contains files common to both the GTK+ 2 and GTK+ 3 +modules. + +%package gtk2-module +License: LGPLv2.0+ +Summary: Portable sound event library -- GTK+ 2 Module +Group: System/Libraries +Requires: %{name}-gtk-module-common = %{version} +Supplements: packageand(libcanberra0:gtk2) + +%description gtk2-module +libcanberra is an implementation of the XDG Sound Theme and Name +Specifications, for generating event sounds on free desktops, such as +GNOME. It comes with several backends (ALSA, PulseAudio, null) and is +designed to be portable. It consists of the following parts: + +This package contains a GTK+ 2 module that triggers input feedback +event sounds. + +%if %build_gtk3 + +%package gtk3-module + +Summary: Portable sound event library -- GTK+ 3 Module +Group: System/Libraries +Requires: %{name}-gtk-module-common = %{version} +Supplements: packageand(libcanberra0:gtk3) + +%description gtk3-module +libcanberra is an implementation of the XDG Sound Theme and Name +Specifications, for generating event sounds on free desktops, such as +GNOME. It comes with several backends (ALSA, PulseAudio, null) and is +designed to be portable. It consists of the following parts: + +This package contains a GTK+ 3 module that triggers input feedback +event sounds. +%endif + +%package -n canberra-gtk-play +License: LGPLv2.0+ +Summary: Portable sound event library -- Utility +Group: System/Libraries +Provides: %{name}-gtk = %{version} +Obsoletes: %{name}-gtk < %{version} +# This package contains login/logout sound for GNOME +Supplements: gnome-session +# This package contains a ready sound for gdm +Supplements: gdm + +%description -n canberra-gtk-play +libcanberra is an implementation of the XDG Sound Theme and Name +Specifications, for generating event sounds on free desktops, such as +GNOME. It comes with several backends (ALSA, PulseAudio, null) and is +designed to be portable. + +This package provides the canberra-gtk-play utility. %package devel License: LGPLv2.0+ -Summary: Portable sound event library +Summary: Portable sound event library -- Development files Group: Development/Libraries/C and C++ -Requires: gtk-doc -Requires: gtk2-devel -Requires: libcanberra-gtk0 = %{version} Requires: libcanberra0 = %{version} +Requires: libcanberra-gtk0 = %{version} +%if %build_gtk3 +Requires: libcanberra-gtk3-0 = %{version} +%endif %description devel libcanberra is an implementation of the XDG Sound Theme and Name Specifications, for generating event sounds on free desktops, such as GNOME. It comes with several backends (ALSA, PulseAudio, null) and is -designed to be portable. It consists of the following parts: +designed to be portable. -1. 1. libcanberra: the main library - -2. 2. libcanberra-gtk: some glue code to make it easier to use - libcanberra from Gtk+ applications - -3. 3. libcanberra-gtk-module: a Gtk+ module that uses libcanberra-gtk to -trigger input feedback event sounds +This package provides the development files for libcanberra. %prep %setup -q @@ -147,9 +196,9 @@ trigger input feedback event sounds %install %makeinstall +find %{buildroot}%{_libdir} -name '*.la' -delete -print %suse_update_desktop_file %{buildroot}%{_datadir}/gnome/autostart/libcanberra-login-sound.desktop %suse_update_desktop_file %{buildroot}%{_datadir}/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop -find %{buildroot} \( -name *.a -o -name *.la \) -exec rm {} \; install -D -m755 %{SOURCE1} %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/libcanberra-gtk-module.sh rm %{buildroot}%{_datadir}/doc/libcanberra/README %find_gconf_schemas @@ -165,11 +214,18 @@ rm -rf %{buildroot} %postun gtk0 -p /sbin/ldconfig -%pre gtk -f %{name}.schemas_pre +%if %build_gtk3 -%preun gtk -f %{name}.schemas_preun +%post gtk3-0 -p /sbin/ldconfig -%posttrans gtk -f %{name}.schemas_posttrans +%postun gtk3-0 -p /sbin/ldconfig +%endif + +%pre gtk-module-common -f %{name}.schemas_pre + +%preun gtk-module-common -f %{name}.schemas_preun + +%posttrans gtk-module-common -f %{name}.schemas_posttrans %files -n libcanberra0 %defattr(-,root,root) @@ -187,12 +243,32 @@ rm -rf %{buildroot} %defattr(-,root,root) %{_libdir}/libcanberra-gtk.so.* -%files gtk -f %{name}.schemas_list -%defattr(-,root,root) -%{_libdir}/gtk-2.0/modules/libcanberra-gtk-module.so +%if %build_gtk3 + +%files gtk3-0 +%defattr(-, root, root) +%{_libdir}/libcanberra-gtk3.so.* +%endif + +%files gtk-module-common -f %{name}.schemas_list +%defattr(-, root, root) %dir %{_sysconfdir}/X11/xinit %dir %{_sysconfdir}/X11/xinit/xinitrc.d %{_sysconfdir}/X11/xinit/xinitrc.d/libcanberra-gtk-module.sh + +%files gtk2-module +%defattr(-, root, root) +%{_libdir}/gtk-2.0/modules/libcanberra-gtk-module.so + +%if %build_gtk3 + +%files gtk3-module +%defattr(-, root, root) +%{_libdir}/gtk-3.0/modules/libcanberra-gtk*-module.so +%endif + +%files -n canberra-gtk-play +%defattr(-,root,root) %{_bindir}/canberra-gtk-play %dir %{_datadir}/gnome %dir %{_datadir}/gnome/autostart @@ -207,12 +283,18 @@ rm -rf %{buildroot} %files devel %defattr(-,root,root) %doc %{_datadir}/gtk-doc/html/libcanberra -%{_includedir}/canberra-gtk.h %{_includedir}/canberra.h -%{_libdir}/libcanberra-gtk.so +%{_includedir}/canberra-gtk.h %{_libdir}/libcanberra.so -%{_libdir}/pkgconfig/libcanberra-gtk.pc +%{_libdir}/libcanberra-gtk.so +%if %build_gtk3 +%{_libdir}/libcanberra-gtk3.so +%endif %{_libdir}/pkgconfig/libcanberra.pc +%{_libdir}/pkgconfig/libcanberra-gtk.pc +%if %build_gtk3 +%{_libdir}/pkgconfig/libcanberra-gtk3.pc +%endif %dir %{_datadir}/vala %dir %{_datadir}/vala/vapi %{_datadir}/vala/vapi/*.vapi