From e51dcfa16648ad536e4b4088d82d161d5fc17b8bc094fd561f077cdf2169b4d9 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 13 May 2010 22:24:39 +0000 Subject: [PATCH 1/6] Accepting request 39966 from GNOME:Factory checked in (request 39966) OBS-URL: https://build.opensuse.org/request/show/39966 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libcanberra?expand=0&rev=32 --- libcanberra-0.23.tar.bz2 | 3 +++ libcanberra-0.24.tar.bz2 | 3 --- libcanberra-fix-pulse-crash.patch | 27 +++++++++++++++++++++++++++ libcanberra.changes | 13 ------------- libcanberra.spec | 9 ++++++--- 5 files changed, 36 insertions(+), 19 deletions(-) create mode 100644 libcanberra-0.23.tar.bz2 delete mode 100644 libcanberra-0.24.tar.bz2 create mode 100644 libcanberra-fix-pulse-crash.patch diff --git a/libcanberra-0.23.tar.bz2 b/libcanberra-0.23.tar.bz2 new file mode 100644 index 0000000..994b187 --- /dev/null +++ b/libcanberra-0.23.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cf36e440a5691e2c227bd622f79e634840287ad3bd3312158afa7e54a17fba32 +size 359554 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-fix-pulse-crash.patch b/libcanberra-fix-pulse-crash.patch new file mode 100644 index 0000000..1303fcf --- /dev/null +++ b/libcanberra-fix-pulse-crash.patch @@ -0,0 +1,27 @@ +From: Michal Schmidt +Date: Tue, 30 Mar 2010 15:50:04 +0000 (+0200) +Subject: pulse: fix use after free in stream_drain_cb() +X-Git-Url: http://git.0pointer.de/?p=libcanberra.git;a=commitdiff_plain;h=04a2c7cac4ff384880309b950c8201803aa37786 + +pulse: fix use after free in stream_drain_cb() +--- + +diff --git a/src/pulse.c b/src/pulse.c +index fcb6b05..d4225d1 100644 +--- a/src/pulse.c ++++ b/src/pulse.c +@@ -663,12 +663,12 @@ static void stream_drain_cb(pa_stream *s, int success, void *userdata) { + pa_stream_disconnect(s); + out->error = err; + out->finished = TRUE; +- } + + if (out->drain_operation) { + pa_operation_unref(out->drain_operation); + out->drain_operation = NULL; + } ++ } + + pa_threaded_mainloop_signal(p->mainloop, FALSE); + } + diff --git a/libcanberra.changes b/libcanberra.changes index 141eca6..e46fcbf 100644 --- a/libcanberra.changes +++ b/libcanberra.changes @@ -1,16 +1,3 @@ -------------------------------------------------------------------- -Sun May 9 21:53:46 CEST 2010 - dimstar@opensuse.org - -- Update to version 0.24: - + fdo#27048: Compile with -DSEAL_ENABLE - + props: set a couple of additional properties by default and - ensure clients may override them - + pulse: fix finish notification for cached sample playback - + fork: call getpid() only once - + build-sys: bump sonames for v0.24 - + pulse: fix use after free in stream_drain_cb(). -- Drop libcanberra-fix-pulse-crash.patch, fixed by upstream. - ------------------------------------------------------------------- Thu Apr 1 19:49:35 CEST 2010 - vuntz@opensuse.org diff --git a/libcanberra.spec b/libcanberra.spec index 2d74914..bc84b56 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.23) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,8 +18,8 @@ Name: libcanberra -Version: 0.24 -Release: 1 +Version: 0.23 +Release: 2 License: LGPLv2.0+ Summary: Portable sound event library Url: http://0pointer.de/lennart/projects/libcanberra/ @@ -27,6 +27,8 @@ Group: System/Libraries Source: libcanberra-%{version}.tar.bz2 Source1: libcanberra-gtk-module.sh Source99: baselibs.conf +# PATCH-FIX-UPSTREAM libcanberra-fix-pulse-crash.patch vuntz@opensuse.org -- Taken from upstream, fix a crash +Patch0: libcanberra-fix-pulse-crash.patch BuildRequires: alsa-devel BuildRequires: gconf2-devel BuildRequires: gstreamer-0_10-devel @@ -140,6 +142,7 @@ trigger input feedback event sounds %prep %setup -q +%patch0 -p1 %build %configure --with-pic --disable-static --disable-rpath --enable-pulse --enable-alsa --enable-null --with-builtin=dso From 05494d919424edf28b297ca453fd63f88446843078186417cb83830765fe10a8 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 22 Jul 2010 07:49:00 +0000 Subject: [PATCH 2/6] Accepting request 43296 from home:dimstar:branches:GNOME:Factory Copy from home:dimstar:branches:GNOME:Factory/libcanberra via accept of submit request 43296 revision 2. Request was accepted with message: thanks, will tweak a bit OBS-URL: https://build.opensuse.org/request/show/43296 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libcanberra?expand=0&rev=33 --- baselibs.conf | 2 + libcanberra-0.23.tar.bz2 | 3 -- libcanberra-0.25.tar.bz2 | 3 ++ libcanberra-fix-pulse-crash.patch | 27 ------------ libcanberra.changes | 28 ++++++++++++ libcanberra.spec | 71 ++++++++++++++++++++++++++----- 6 files changed, 93 insertions(+), 41 deletions(-) delete mode 100644 libcanberra-0.23.tar.bz2 create mode 100644 libcanberra-0.25.tar.bz2 delete mode 100644 libcanberra-fix-pulse-crash.patch diff --git a/baselibs.conf b/baselibs.conf index a2d1440..697d2db 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -2,3 +2,5 @@ libcanberra0 libcanberra-gtk0 libcanberra-gtk supplements "packageand(libcanberra-gtk:gtk2-)" +libcanberra-gtk3-0 +libcanberra-gtk3 diff --git a/libcanberra-0.23.tar.bz2 b/libcanberra-0.23.tar.bz2 deleted file mode 100644 index 994b187..0000000 --- a/libcanberra-0.23.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cf36e440a5691e2c227bd622f79e634840287ad3bd3312158afa7e54a17fba32 -size 359554 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-fix-pulse-crash.patch b/libcanberra-fix-pulse-crash.patch deleted file mode 100644 index 1303fcf..0000000 --- a/libcanberra-fix-pulse-crash.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: Michal Schmidt -Date: Tue, 30 Mar 2010 15:50:04 +0000 (+0200) -Subject: pulse: fix use after free in stream_drain_cb() -X-Git-Url: http://git.0pointer.de/?p=libcanberra.git;a=commitdiff_plain;h=04a2c7cac4ff384880309b950c8201803aa37786 - -pulse: fix use after free in stream_drain_cb() ---- - -diff --git a/src/pulse.c b/src/pulse.c -index fcb6b05..d4225d1 100644 ---- a/src/pulse.c -+++ b/src/pulse.c -@@ -663,12 +663,12 @@ static void stream_drain_cb(pa_stream *s, int success, void *userdata) { - pa_stream_disconnect(s); - out->error = err; - out->finished = TRUE; -- } - - if (out->drain_operation) { - pa_operation_unref(out->drain_operation); - out->drain_operation = NULL; - } -+ } - - pa_threaded_mainloop_signal(p->mainloop, FALSE); - } - diff --git a/libcanberra.changes b/libcanberra.changes index e46fcbf..12a309d 100644 --- a/libcanberra.changes +++ b/libcanberra.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Tue Jul 13 16:37:13 CEST 2010 - dimstar@opensuse.org + +- Update to version 0.25: + + gtk: optionally build for both gtk2 and gtk3 + + build-sys: properly create gtk3 module link + + cache: don't use destructors unless running in valgrind + + build-sys: bump version + + docs: update for 0.25 + + git: ignore more files + + build-sys: drop duplicate conditional + + build-sys: various build-system beautifications + + build-sys: fix gconf build line + + build-sys: fix make distcheck + +------------------------------------------------------------------- +Sun May 9 21:53:46 CEST 2010 - dimstar@opensuse.org + +- Update to version 0.24: + + fdo#27048: Compile with -DSEAL_ENABLE + + props: set a couple of additional properties by default and + ensure clients may override them + + pulse: fix finish notification for cached sample playback + + fork: call getpid() only once + + build-sys: bump sonames for v0.24 + + pulse: fix use after free in stream_drain_cb(). +- Drop libcanberra-fix-pulse-crash.patch, fixed by upstream. + ------------------------------------------------------------------- Thu Apr 1 19:49:35 CEST 2010 - vuntz@opensuse.org diff --git a/libcanberra.spec b/libcanberra.spec index bc84b56..56695a0 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,5 +1,5 @@ # -# spec file for package libcanberra (Version 0.23) +# spec file for package libcanberra (Version 0.25) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,22 +18,21 @@ Name: libcanberra -Version: 0.23 -Release: 2 -License: LGPLv2.0+ +Version: 0.25 +Release: 1 +License: LGPL v2.0 or later Summary: Portable sound event library Url: http://0pointer.de/lennart/projects/libcanberra/ Group: System/Libraries Source: libcanberra-%{version}.tar.bz2 Source1: libcanberra-gtk-module.sh Source99: baselibs.conf -# PATCH-FIX-UPSTREAM libcanberra-fix-pulse-crash.patch vuntz@opensuse.org -- Taken from upstream, fix a crash -Patch0: libcanberra-fix-pulse-crash.patch BuildRequires: alsa-devel BuildRequires: gconf2-devel BuildRequires: gstreamer-0_10-devel BuildRequires: gtk-doc BuildRequires: gtk2-devel +BuildRequires: gtk3-devel BuildRequires: libpulse-devel >= 0.9.11 BuildRequires: libvorbis-devel BuildRequires: lynx @@ -42,7 +41,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %define debug_package_requires libcanberra0 = %{version}-%{release} %package -n libcanberra0 -License: LGPLv2.0+ +License: LGPL v2.0 or later Summary: Portable sound event library Group: System/Libraries Requires: libpulse0 >= 0.9.11 @@ -77,7 +76,7 @@ designed to be portable. It consists of the following parts: trigger input feedback event sounds %package gtk0 -License: LGPLv2.0+ +License: LGPL v2.0 or later Summary: Portable sound event library Group: System/Libraries Requires: libcanberra0 = %{version} @@ -96,8 +95,44 @@ designed to be portable. It consists of the following parts: 3. 3. libcanberra-gtk-module: a Gtk+ module that uses libcanberra-gtk to trigger input feedback event sounds +%package gtk3-0 +Summary: Portable sound event library +Group: System/Libraries + +%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 + +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 + +%package gtk3 +Summary: Portable sound event library +Group: System/Libraries + +%description gtk3 +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 + %package gtk -License: LGPLv2.0+ +License: LGPL v2.0 or later Summary: Portable sound event library Group: System/Libraries Requires: libcanberra0 = %{version} @@ -118,12 +153,13 @@ designed to be portable. It consists of the following parts: trigger input feedback event sounds %package devel -License: LGPLv2.0+ +License: LGPL v2.0 or later Summary: Portable sound event library Group: Development/Libraries/C and C++ Requires: gtk-doc Requires: gtk2-devel Requires: libcanberra-gtk0 = %{version} +Requires: libcanberra-gtk3-0 = %{version} Requires: libcanberra0 = %{version} %description devel @@ -142,7 +178,6 @@ trigger input feedback event sounds %prep %setup -q -%patch0 -p1 %build %configure --with-pic --disable-static --disable-rpath --enable-pulse --enable-alsa --enable-null --with-builtin=dso @@ -168,6 +203,10 @@ rm -rf %{buildroot} %postun gtk0 -p /sbin/ldconfig +%post gtk3-0 -p /sbin/ldconfig + +%postun gtk3-0 -p /sbin/ldconfig + %pre gtk -f %{name}.schemas_pre %preun gtk -f %{name}.schemas_preun @@ -207,15 +246,25 @@ rm -rf %{buildroot} %dir %{_datadir}/gdm/autostart/LoginWindow %{_datadir}/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop +%files gtk3-0 +%defattr(-, root, root) +%{_libdir}/libcanberra-gtk3.so.* + +%files gtk3 +%defattr(-, root, root) +%{_libdir}/gtk-3.0/modules/libcanberra*.so + %files devel %defattr(-,root,root) %doc %{_datadir}/gtk-doc/html/libcanberra %{_includedir}/canberra-gtk.h %{_includedir}/canberra.h +%{_libdir}/libcanberra-gtk3.so %{_libdir}/libcanberra-gtk.so %{_libdir}/libcanberra.so %{_libdir}/pkgconfig/libcanberra-gtk.pc %{_libdir}/pkgconfig/libcanberra.pc +%{_libdir}/pkgconfig/libcanberra-gtk3.pc %dir %{_datadir}/vala %dir %{_datadir}/vala/vapi %{_datadir}/vala/vapi/*.vapi From 68f652dc73cc1a593043330603db1fc3f99470aff675291bd0be32ec8c1505af Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 22 Jul 2010 21:43:35 +0000 Subject: [PATCH 3/6] Accepting request 43740 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/libcanberra via accept of submit request 43740 revision 2. Request was accepted with message: auto-approving myself, to make it easier for the next batch of reviews OBS-URL: https://build.opensuse.org/request/show/43740 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libcanberra?expand=0&rev=34 --- baselibs.conf | 7 +- libcanberra.changes | 33 +++++-- libcanberra.spec | 210 ++++++++++++++++++++++---------------------- 3 files changed, 134 insertions(+), 116 deletions(-) diff --git a/baselibs.conf b/baselibs.conf index 697d2db..5436fd0 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,6 +1,7 @@ libcanberra0 libcanberra-gtk0 -libcanberra-gtk - supplements "packageand(libcanberra-gtk:gtk2-)" libcanberra-gtk3-0 -libcanberra-gtk3 +libcanberra-gtk2-module + supplements "packageand(libcanberra0:gtk2-)" +libcanberra-gtk3-module + supplements "packageand(libcanberra0:gtk3-)" diff --git a/libcanberra.changes b/libcanberra.changes index 12a309d..0946903 100644 --- a/libcanberra.changes +++ b/libcanberra.changes @@ -1,17 +1,34 @@ +------------------------------------------------------------------- +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 - + build-sys: properly create gtk3 module link + cache: don't use destructors unless running in valgrind - + build-sys: bump version - + docs: update for 0.25 - + git: ignore more files - + build-sys: drop duplicate conditional - + build-sys: various build-system beautifications - + build-sys: fix gconf build line - + build-sys: fix make distcheck + + 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 56695a0..369fc4a 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -27,19 +27,25 @@ 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: gtk3-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) +BuildRequires: pkgconfig(gtk+-3.0) +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: LGPL v2.0 or later Summary: Portable sound event library @@ -47,56 +53,30 @@ 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: LGPL v2.0 or later -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 - -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 a library to make it easier to use +libcanberra from GTK+ 2 applications. %package gtk3-0 -Summary: Portable sound event library +Summary: Portable sound event library -- GTK+ 3 Library Group: System/Libraries %description gtk3-0 @@ -105,76 +85,90 @@ 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. -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 - -%package gtk3 -Summary: Portable sound event library +%package gtk-module-common +Summary: Portable sound event library -- Common Files for GTK+ Modules Group: System/Libraries - -%description gtk3 -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 - -%package gtk -License: LGPL v2.0 or later -Summary: Portable sound event library -Group: System/Libraries -Requires: libcanberra0 = %{version} +Recommends: %{name}-gtk2-module +Recommends: %{name}-gtk3-module +BuildArch: noarch %gconf_schemas_prereq -%description gtk +%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: -1. 1. libcanberra: the main library +This package contains files common to both the GTK+ 2 and GTK+ 3 +modules. -2. 2. libcanberra-gtk: some glue code to make it easier to use - libcanberra from Gtk+ applications +%package gtk2-module +Summary: Portable sound event library -- GTK+ 2 Module +Group: System/Libraries +Requires: %{name}-gtk-module-common = %{version} +Supplements: packageand(libcanberra0:gtk2) -3. 3. libcanberra-gtk-module: a Gtk+ module that uses libcanberra-gtk to -trigger input feedback event sounds +%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. + +%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. + +%package -n canberra-gtk-play +License: LGPL v2.0 or later +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: LGPL v2.0 or later -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: libcanberra0 = %{version} Requires: libcanberra-gtk0 = %{version} Requires: libcanberra-gtk3-0 = %{version} -Requires: libcanberra0 = %{version} %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 @@ -185,9 +179,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 @@ -207,11 +201,11 @@ rm -rf %{buildroot} %postun gtk3-0 -p /sbin/ldconfig -%pre gtk -f %{name}.schemas_pre +%pre gtk-module-common -f %{name}.schemas_pre -%preun gtk -f %{name}.schemas_preun +%preun gtk-module-common -f %{name}.schemas_preun -%posttrans gtk -f %{name}.schemas_posttrans +%posttrans gtk-module-common -f %{name}.schemas_posttrans %files -n libcanberra0 %defattr(-,root,root) @@ -229,12 +223,26 @@ 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 +%files gtk3-0 +%defattr(-, root, root) +%{_libdir}/libcanberra-gtk3.so.* + +%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 + +%files gtk3-module +%defattr(-, root, root) +%{_libdir}/gtk-3.0/modules/libcanberra-gtk*-module.so + +%files -n canberra-gtk-play +%defattr(-,root,root) %{_bindir}/canberra-gtk-play %dir %{_datadir}/gnome %dir %{_datadir}/gnome/autostart @@ -246,24 +254,16 @@ rm -rf %{buildroot} %dir %{_datadir}/gdm/autostart/LoginWindow %{_datadir}/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop -%files gtk3-0 -%defattr(-, root, root) -%{_libdir}/libcanberra-gtk3.so.* - -%files gtk3 -%defattr(-, root, root) -%{_libdir}/gtk-3.0/modules/libcanberra*.so - %files devel %defattr(-,root,root) %doc %{_datadir}/gtk-doc/html/libcanberra -%{_includedir}/canberra-gtk.h %{_includedir}/canberra.h -%{_libdir}/libcanberra-gtk3.so -%{_libdir}/libcanberra-gtk.so +%{_includedir}/canberra-gtk.h %{_libdir}/libcanberra.so -%{_libdir}/pkgconfig/libcanberra-gtk.pc +%{_libdir}/libcanberra-gtk.so +%{_libdir}/libcanberra-gtk3.so %{_libdir}/pkgconfig/libcanberra.pc +%{_libdir}/pkgconfig/libcanberra-gtk.pc %{_libdir}/pkgconfig/libcanberra-gtk3.pc %dir %{_datadir}/vala %dir %{_datadir}/vala/vapi From 5b985e6974a9ef04e359a955e3b61a04790f9fb1abdba63757004b38f07b5f56 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Mon, 9 Aug 2010 10:32:46 +0000 Subject: [PATCH 4/6] Accepting request 44977 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/libcanberra via accept of submit request 44977 revision 2. Request was accepted with message: thanks OBS-URL: https://build.opensuse.org/request/show/44977 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libcanberra?expand=0&rev=35 --- libcanberra.changes | 8 ++++++++ libcanberra.spec | 22 +++++++++++++++++++++- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/libcanberra.changes b/libcanberra.changes index 0946903..7757249 100644 --- a/libcanberra.changes +++ b/libcanberra.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +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 diff --git a/libcanberra.spec b/libcanberra.spec index 369fc4a..94076b1 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -15,7 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - +%define build_gtk3 0 Name: libcanberra Version: 0.25 @@ -34,7 +34,9 @@ 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 @@ -75,6 +77,7 @@ designed to be portable. This package contains a library to make it easier to use libcanberra from GTK+ 2 applications. +%if %build_gtk3 %package gtk3-0 Summary: Portable sound event library -- GTK+ 3 Library Group: System/Libraries @@ -87,12 +90,15 @@ designed to be portable. It consists of the following parts: This package contains a library to make it easier to use libcanberra from GTK+ 3 applications. +%endif %package gtk-module-common 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 @@ -120,6 +126,7 @@ 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 @@ -134,6 +141,7 @@ 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: LGPL v2.0 or later @@ -160,7 +168,9 @@ Summary: Portable sound event library -- Development files Group: Development/Libraries/C and C++ 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 @@ -197,9 +207,11 @@ rm -rf %{buildroot} %postun gtk0 -p /sbin/ldconfig +%if %build_gtk3 %post gtk3-0 -p /sbin/ldconfig %postun gtk3-0 -p /sbin/ldconfig +%endif %pre gtk-module-common -f %{name}.schemas_pre @@ -223,9 +235,11 @@ rm -rf %{buildroot} %defattr(-,root,root) %{_libdir}/libcanberra-gtk.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) @@ -237,9 +251,11 @@ rm -rf %{buildroot} %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) @@ -261,10 +277,14 @@ rm -rf %{buildroot} %{_includedir}/canberra-gtk.h %{_libdir}/libcanberra.so %{_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 From 990d73bb3a8a9ae874f457d586c1e36c98acde3c43c7339b05ac4d3903550248 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 9 Aug 2010 16:04:59 +0000 Subject: [PATCH 5/6] Accepting request 45105 from GNOME:Factory checked in (request 45105) OBS-URL: https://build.opensuse.org/request/show/45105 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libcanberra?expand=0&rev=36 --- baselibs.conf | 7 +- libcanberra-0.24.tar.bz2 | 3 + libcanberra-0.25.tar.bz2 | 3 - libcanberra.changes | 40 ------- libcanberra.spec | 222 +++++++++++++-------------------------- 5 files changed, 80 insertions(+), 195 deletions(-) create mode 100644 libcanberra-0.24.tar.bz2 delete mode 100644 libcanberra-0.25.tar.bz2 diff --git a/baselibs.conf b/baselibs.conf index 5436fd0..a2d1440 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,7 +1,4 @@ libcanberra0 libcanberra-gtk0 -libcanberra-gtk3-0 -libcanberra-gtk2-module - supplements "packageand(libcanberra0:gtk2-)" -libcanberra-gtk3-module - supplements "packageand(libcanberra0:gtk3-)" +libcanberra-gtk + supplements "packageand(libcanberra-gtk:gtk2-)" diff --git a/libcanberra-0.24.tar.bz2 b/libcanberra-0.24.tar.bz2 new file mode 100644 index 0000000..614bb50 --- /dev/null +++ b/libcanberra-0.24.tar.bz2 @@ -0,0 +1,3 @@ +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 deleted file mode 100644 index 5f435ce..0000000 --- a/libcanberra-0.25.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d07cdcc059386a5f8b60bbf44327874601e0fbdd0c416ca13582f2719819d53d -size 363401 diff --git a/libcanberra.changes b/libcanberra.changes index 7757249..141eca6 100644 --- a/libcanberra.changes +++ b/libcanberra.changes @@ -1,43 +1,3 @@ -------------------------------------------------------------------- -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 94076b1..2d74914 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,5 +1,5 @@ # -# spec file for package libcanberra (Version 0.25) +# spec file for package libcanberra (Version 0.24) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -15,170 +15,128 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%define build_gtk3 0 + Name: libcanberra -Version: 0.25 +Version: 0.24 Release: 1 -License: LGPL v2.0 or later +License: LGPLv2.0+ Summary: Portable sound event library Url: http://0pointer.de/lennart/projects/libcanberra/ 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: LGPL v2.0 or later +License: LGPLv2.0+ Summary: Portable sound event library 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. +designed to be portable. It consists of the following parts: -This package contains the main library. +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 %package gtk0 -License: LGPL v2.0 or later -Summary: Portable sound event library -- GTK+ 2 Library +License: LGPLv2.0+ +Summary: Portable sound event 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. - -This package contains a library to make it easier to use -libcanberra from GTK+ 2 applications. - -%if %build_gtk3 -%package gtk3-0 -Summary: Portable sound event library -- GTK+ 3 Library -Group: System/Libraries - -%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: -This package contains a library to make it easier to use -libcanberra from GTK+ 3 applications. -%endif +1. 1. libcanberra: the main library -%package gtk-module-common -Summary: Portable sound event library -- Common Files for GTK+ Modules +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 + +%package gtk +License: LGPLv2.0+ +Summary: Portable sound event library Group: System/Libraries -Recommends: %{name}-gtk2-module -%if %build_gtk3 -Recommends: %{name}-gtk3-module -%endif -BuildArch: noarch +Requires: libcanberra0 = %{version} %gconf_schemas_prereq -%description gtk-module-common +%description gtk 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. +1. 1. libcanberra: the main library -%package gtk2-module -Summary: Portable sound event library -- GTK+ 2 Module -Group: System/Libraries -Requires: %{name}-gtk-module-common = %{version} -Supplements: packageand(libcanberra0:gtk2) +2. 2. libcanberra-gtk: some glue code to make it easier to use + libcanberra from Gtk+ applications -%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: LGPL v2.0 or later -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. +3. 3. libcanberra-gtk-module: a Gtk+ module that uses libcanberra-gtk to +trigger input feedback event sounds %package devel -License: LGPL v2.0 or later -Summary: Portable sound event library -- Development files +License: LGPLv2.0+ +Summary: Portable sound event library Group: Development/Libraries/C and C++ -Requires: libcanberra0 = %{version} +Requires: gtk-doc +Requires: gtk2-devel Requires: libcanberra-gtk0 = %{version} -%if %build_gtk3 -Requires: libcanberra-gtk3-0 = %{version} -%endif +Requires: libcanberra0 = %{version} %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. +designed to be portable. It consists of the following parts: -This package provides the development files for libcanberra. +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 %prep %setup -q @@ -189,9 +147,9 @@ This package provides the development files for libcanberra. %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 @@ -207,17 +165,11 @@ rm -rf %{buildroot} %postun gtk0 -p /sbin/ldconfig -%if %build_gtk3 -%post gtk3-0 -p /sbin/ldconfig +%pre gtk -f %{name}.schemas_pre -%postun gtk3-0 -p /sbin/ldconfig -%endif +%preun gtk -f %{name}.schemas_preun -%pre gtk-module-common -f %{name}.schemas_pre - -%preun gtk-module-common -f %{name}.schemas_preun - -%posttrans gtk-module-common -f %{name}.schemas_posttrans +%posttrans gtk -f %{name}.schemas_posttrans %files -n libcanberra0 %defattr(-,root,root) @@ -235,30 +187,12 @@ rm -rf %{buildroot} %defattr(-,root,root) %{_libdir}/libcanberra-gtk.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) +%files gtk -f %{name}.schemas_list +%defattr(-,root,root) +%{_libdir}/gtk-2.0/modules/libcanberra-gtk-module.so %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 @@ -273,18 +207,12 @@ rm -rf %{buildroot} %files devel %defattr(-,root,root) %doc %{_datadir}/gtk-doc/html/libcanberra -%{_includedir}/canberra.h %{_includedir}/canberra-gtk.h -%{_libdir}/libcanberra.so +%{_includedir}/canberra.h %{_libdir}/libcanberra-gtk.so -%if %build_gtk3 -%{_libdir}/libcanberra-gtk3.so -%endif -%{_libdir}/pkgconfig/libcanberra.pc +%{_libdir}/libcanberra.so %{_libdir}/pkgconfig/libcanberra-gtk.pc -%if %build_gtk3 -%{_libdir}/pkgconfig/libcanberra-gtk3.pc -%endif +%{_libdir}/pkgconfig/libcanberra.pc %dir %{_datadir}/vala %dir %{_datadir}/vala/vapi %{_datadir}/vala/vapi/*.vapi From 5c641ef995b48818882518ea32f18cbff629e9564c17d809b17c42526c38b014 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 9 Aug 2010 16:05:01 +0000 Subject: [PATCH 6/6] Updating link to change in openSUSE:Factory/libcanberra revision 21.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libcanberra?expand=0&rev=19c714b2b83582aa7e0020ed951a089b --- baselibs.conf | 7 +- libcanberra-0.24.tar.bz2 | 3 - libcanberra-0.25.tar.bz2 | 3 + libcanberra.changes | 40 +++++++ libcanberra.spec | 222 +++++++++++++++++++++++++++------------ 5 files changed, 200 insertions(+), 75 deletions(-) delete mode 100644 libcanberra-0.24.tar.bz2 create mode 100644 libcanberra-0.25.tar.bz2 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