commit libcanberra for openSUSE:Factory
Hello community, here is the log from the commit of package libcanberra for openSUSE:Factory checked in at 2018-03-08 10:52:31 Comparing /work/SRC/openSUSE:Factory/libcanberra (Old) and /work/SRC/openSUSE:Factory/.libcanberra.new (New) Package is "libcanberra" Thu Mar 8 10:52:31 2018 rev:45 rq:583059 version:0.30 Changes: --- /work/SRC/openSUSE:Factory/libcanberra/libcanberra.changes 2017-02-03 17:47:10.504244431 +0100 +++ /work/SRC/openSUSE:Factory/.libcanberra.new/libcanberra.changes 2018-03-08 10:52:33.032026521 +0100 @@ -1,0 +2,10 @@ +Mon Mar 5 15:58:50 UTC 2018 - jeng...@inai.de + +- Fix SRPM group. Update summaries. + +--- +Wed Feb 28 16:34:01 UTC 2018 - dims...@opensuse.org + +- Modernize spec-file by calling spec-cleaner + +--- Other differences: -- ++ libcanberra.spec ++ --- /var/tmp/diff_new_pack.Xg0f47/_old 2018-03-08 10:52:33.72473 +0100 +++ /var/tmp/diff_new_pack.Xg0f47/_new 2018-03-08 10:52:33.72473 +0100 @@ -1,7 +1,7 @@ # # spec file for package libcanberra # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,8 +21,8 @@ Version:0.30 Release:0 Summary:Portable sound event library -License:LGPL-2.0+ -Group: System/Libraries +License:LGPL-2.0-or-later +Group: Development/Libraries/GNOME Url:http://0pointer.de/lennart/projects/libcanberra Source: http://0pointer.de/lennart/projects/libcanberra/%{name}-%{version}.tar.xz Source1:libcanberra-gtk-module.sh @@ -134,8 +134,8 @@ event sounds. %package -n canberra-gtk-play -Summary:Portable sound event library -- Utility -Group: System/Libraries +Summary:Utilities from libcanberra +Group: System/GUI/GNOME Provides: %{name}-gtk = %{version} Obsoletes: %{name}-gtk < %{version} @@ -148,13 +148,13 @@ This package provides the canberra-gtk-play utility. %package -n canberra-gtk-play-gnome -Summary:Portable sound event library -- Utility +Summary:.desktop links for the canberra-gtk-play utility # Disable supplements as we do not want it installed by default. # This package contains a ready sound for gdm #Supplements:gdm # This package contains login/logout sound for GNOME. #Supplements:gnome-session -Group: System/Libraries +Group: System/GUI/GNOME Provides: %{name}-gtk-gnome = %{version} Obsoletes: %{name}-gtk-gnome < %{version} @@ -171,7 +171,7 @@ this will require a different sound-theme for it to be operational. %package devel -Summary:Portable sound event library -- Development files +Summary:Development files for libcanberra, a portable sound event library Group: Development/Libraries/C and C++ Requires: libcanberra0 = %{version} @@ -184,7 +184,7 @@ This package provides the development files for libcanberra. %package -n libcanberra-gtk3-devel -Summary:Portable sound event library -- Development files +Summary:GTK+ 3 development files for libcanberra Group: Development/Libraries/C and C++ Requires: libcanberra-devel Requires: libcanberra-gtk3-0 = %{version} @@ -199,7 +199,7 @@ This package provides the development files for libcanberra-gtk3. %package -n libcanberra-gtk-devel -Summary:Portable sound event library -- Development files +Summary:GTK+ 2 development files for libcanberra Group: Development/Libraries/C and C++ Requires: libcanberra-devel Requires: libcanberra-gtk0 = %{version} @@ -240,19 +240,13 @@ find %{buildroot} -type f -name "*.la" -delete -print %post -n libcanberra0 -p /sbin/ldconfig - %postun -n libcanberra0 -p /sbin/ldconfig - %post gtk0 -p /sbin/ldconfig - %postun gtk0 -p /sbin/ldconfig - %post gtk3-0 -p /sbin/ldconfig - %postun gtk3-0 -p /sbin/ldconfig %files -n libcanberra0 -%defattr(-,root,root) %doc README LGPL %{_libdir}/libcanberra.so.* %dir %{_libdir}/libcanberra-%{version}/ @@ -263,15 +257,12 @@ %{_libdir}/libcanberra-%{version}/libcanberra-pulse.so %files gtk0 -%defattr(-,root,root) %{_libdir}/libcanberra-gtk.so.* %files gtk3-0 -%defattr(-,root,root) %{_libdir}/libcanberra-gtk3.so.* %files gtk-module-common -%defattr(-,root,root) %dir %{_sysconfdir}/X11/xinit/ %dir %{_sysconfdir}/X11/xinit/xinitrc.d/
commit libcanberra for openSUSE:Factory
Hello community, here is the log from the commit of package libcanberra for openSUSE:Factory checked in at 2017-01-27 10:44:38 Comparing /work/SRC/openSUSE:Factory/libcanberra (Old) and /work/SRC/openSUSE:Factory/.libcanberra.new (New) Package is "libcanberra" Changes: --- /work/SRC/openSUSE:Factory/libcanberra/libcanberra.changes 2016-08-17 12:01:49.0 +0200 +++ /work/SRC/openSUSE:Factory/.libcanberra.new/libcanberra.changes 2017-02-03 17:47:10.504244431 +0100 @@ -1,0 +2,7 @@ +Mon Dec 19 13:05:15 UTC 2016 - sor.ale...@meowr.ru + +- Remove the lynx build dependency: of questionable need. +- Build for Gtk3 unconditionally. +- Spec cleanup. + +--- Other differences: -- ++ libcanberra.spec ++ --- /var/tmp/diff_new_pack.IZ58jo/_old 2017-02-03 17:47:10.936183540 +0100 +++ /var/tmp/diff_new_pack.IZ58jo/_new 2017-02-03 17:47:10.936183540 +0100 @@ -16,43 +16,38 @@ # -%define build_gtk3 1 - +%define debug_package_requires libcanberra0 = %{version}-%{release} Name: libcanberra Version:0.30 Release:0 Summary:Portable sound event library License:LGPL-2.0+ Group: System/Libraries -Url:http://0pointer.de/lennart/projects/libcanberra/ +Url:http://0pointer.de/lennart/projects/libcanberra Source: http://0pointer.de/lennart/projects/libcanberra/%{name}-%{version}.tar.xz Source1:libcanberra-gtk-module.sh Source99: baselibs.conf -#PATCH-FIX-UPSTREAM libcanberra-multi-backend.patch bnc#753243 fdo#51662 dims...@opensuse.org -- Set the multi backend as default and allow it actually to work. +# PATCH-FIX-UPSTREAM libcanberra-multi-backend.patch boo#753243 fdo#51662 dims...@opensuse.org -- Set the multi backend as default and allow it actually to work. Patch0: libcanberra-multi-backend.patch -#PATCH-FIX-UPSTREAM libcanberra-broadway-fix.patch bnc#789066 michael.me...@suse.com -- mailed to lennart +# PATCH-FIX-UPSTREAM libcanberra-broadway-fix.patch boo#789066 michael.me...@suse.com Patch1: libcanberra-broadway-fix.patch BuildRequires: gtk-doc BuildRequires: libltdl-devel -BuildRequires: lynx +BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(glib-2.0) >= 2.32 BuildRequires: pkgconfig(gtk+-2.0) -%if %build_gtk3 BuildRequires: pkgconfig(gtk+-3.0) -%endif BuildRequires: pkgconfig(libpulse) >= 0.9.11 BuildRequires: pkgconfig(vorbisfile) BuildRequires: pkgconfig(x11) -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. +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 Summary:Portable sound event library @@ -61,9 +56,9 @@ %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. +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 the main library. @@ -73,42 +68,37 @@ %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. +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. +Specifications, for generating event sounds on free desktops, such +as GNOME. It comes with several
commit libcanberra for openSUSE:Factory
Hello community, here is the log from the commit of package libcanberra for openSUSE:Factory checked in at 2016-08-17 12:01:47 Comparing /work/SRC/openSUSE:Factory/libcanberra (Old) and /work/SRC/openSUSE:Factory/.libcanberra.new (New) Package is "libcanberra" Changes: --- /work/SRC/openSUSE:Factory/libcanberra/libcanberra.changes 2016-01-21 23:41:19.0 +0100 +++ /work/SRC/openSUSE:Factory/.libcanberra.new/libcanberra.changes 2016-08-17 12:01:49.0 +0200 @@ -1,0 +2,5 @@ +Wed May 25 23:35:32 UTC 2016 - sree...@suse.com + +- Update to GNOME 3.20.2 Fate#318572 + +--- Other differences: --
commit libcanberra for openSUSE:Factory
Hello community, here is the log from the commit of package libcanberra for openSUSE:Factory checked in at 2016-01-21 23:41:18 Comparing /work/SRC/openSUSE:Factory/libcanberra (Old) and /work/SRC/openSUSE:Factory/.libcanberra.new (New) Package is "libcanberra" Changes: --- /work/SRC/openSUSE:Factory/libcanberra/libcanberra.changes 2016-01-05 09:41:00.0 +0100 +++ /work/SRC/openSUSE:Factory/.libcanberra.new/libcanberra.changes 2016-01-21 23:41:19.0 +0100 @@ -1,0 +2,8 @@ +Thu Jan 14 12:11:44 UTC 2016 - dims...@opensuse.org + +- Do not require sound-theme-freedesktop by libcanberra0: if this + is wanted on a default install, it is up to the DE pattern to + recommend/require this - it is not needed for the libraries + proper functioning. + +--- Other differences: -- ++ libcanberra.spec ++ --- /var/tmp/diff_new_pack.fCqrgM/_old 2016-01-21 23:41:20.0 +0100 +++ /var/tmp/diff_new_pack.fCqrgM/_new 2016-01-21 23:41:20.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package libcanberra # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -58,7 +58,6 @@ Summary:Portable sound event library Group: System/Libraries Requires: libpulse0 >= 0.9.11 -Requires: sound-theme-freedesktop %description -n libcanberra0 libcanberra is an implementation of the XDG Sound Theme and Name
commit libcanberra for openSUSE:Factory
Hello community, here is the log from the commit of package libcanberra for openSUSE:Factory checked in at 2016-01-05 09:40:34 Comparing /work/SRC/openSUSE:Factory/libcanberra (Old) and /work/SRC/openSUSE:Factory/.libcanberra.new (New) Package is "libcanberra" Changes: --- /work/SRC/openSUSE:Factory/libcanberra/libcanberra.changes 2015-11-08 14:35:47.0 +0100 +++ /work/SRC/openSUSE:Factory/.libcanberra.new/libcanberra.changes 2016-01-05 09:41:00.0 +0100 @@ -1,0 +2,7 @@ +Mon Dec 28 16:43:10 UTC 2015 - zai...@opensuse.org + +- Split out libcanberra-gtk-devel and libcanberra-gtk3-devel + sub-packages, this will make it possible for us to build + dependant packages without having to pull in both gtk2 and gtk3. + +--- Other differences: -- ++ libcanberra.spec ++ --- /var/tmp/diff_new_pack.GlQE6w/_old 2016-01-05 09:41:01.0 +0100 +++ /var/tmp/diff_new_pack.GlQE6w/_new 2016-01-05 09:41:01.0 +0100 @@ -188,19 +188,48 @@ %package devel Summary:Portable sound event library -- Development files Group: Development/Libraries/C and C++ -Requires: libcanberra-gtk0 = %{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. + +This package provides the development files for libcanberra. + %if %build_gtk3 + +%package -n libcanberra-gtk3-devel +Summary:Portable sound event library -- Development files +Group: Development/Libraries/C and C++ +Requires: libcanberra-devel Requires: libcanberra-gtk3-0 = %{version} +Requires: libcanberra0 = %{version} %endif -%description devel +%description -n libcanberra-gtk3-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. -This package provides the development files for libcanberra. +This package provides the development files for libcanberra-gtk3 + +%package -n libcanberra-gtk-devel +Summary:Portable sound event library -- Development files +Group: Development/Libraries/C and C++ +Requires: libcanberra-devel +Requires: libcanberra-gtk0 = %{version} +Requires: libcanberra0 = %{version} + +%description -n libcanberra-gtk-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. + +This package provides the development files for libcanberra-gtk2 %prep %setup -q @@ -294,21 +323,26 @@ %dir %{_datadir}/gdm/autostart/LoginWindow %{_datadir}/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop +%files -n libcanberra-gtk-devel +%defattr(-,root,root) +%{_libdir}/libcanberra-gtk.so +%{_libdir}/pkgconfig/libcanberra-gtk.pc + +%if %build_gtk3 + +%files -n libcanberra-gtk3-devel +%defattr(-,root,root) +%{_libdir}/libcanberra-gtk3.so +%{_libdir}/pkgconfig/libcanberra-gtk3.pc +%endif + %files devel %defattr(-,root,root) %doc %{_datadir}/gtk-doc/html/libcanberra %{_includedir}/canberra.h %{_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
commit libcanberra for openSUSE:Factory
Hello community, here is the log from the commit of package libcanberra for openSUSE:Factory checked in at 2015-11-08 14:35:45 Comparing /work/SRC/openSUSE:Factory/libcanberra (Old) and /work/SRC/openSUSE:Factory/.libcanberra.new (New) Package is "libcanberra" Changes: --- /work/SRC/openSUSE:Factory/libcanberra/libcanberra.changes 2013-02-07 14:23:55.0 +0100 +++ /work/SRC/openSUSE:Factory/.libcanberra.new/libcanberra.changes 2015-11-08 14:35:47.0 +0100 @@ -1,0 +2,10 @@ +Fri Nov 6 00:54:02 UTC 2015 - zai...@opensuse.org + +- Split out a new sub-package canberra-gtk-play-gnome: Currently + there are no desktop-login, desktop-logout or session-ready + sounds in the freedesktop sound theme, so installing this will + require a different sound-theme for it to be operational. Having + this in a own sub-package will avoid logspam about missing files. + Fixes boo#953862. + +--- Other differences: -- ++ libcanberra.spec ++ --- /var/tmp/diff_new_pack.nycSGH/_old 2015-11-08 14:35:48.0 +0100 +++ /var/tmp/diff_new_pack.nycSGH/_new 2015-11-08 14:35:48.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package libcanberra # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -150,10 +150,6 @@ %package -n canberra-gtk-play Summary:Portable sound event library -- Utility Group: System/Libraries -# This package contains a ready sound for gdm -Supplements:gdm -# This package contains login/logout sound for GNOME -Supplements:gnome-session Provides: %{name}-gtk = %{version} Obsoletes: %{name}-gtk < %{version} @@ -165,6 +161,30 @@ This package provides the canberra-gtk-play utility. +%package -n canberra-gtk-play-gnome +Summary:Portable sound event library -- Utility +Group: System/Libraries +# Disable supplements as we do not want it installed by default. +# This package contains a ready sound for gdm +#Supplements:gdm +# This package contains login/logout sound for GNOME +#Supplements:gnome-session +Provides: %{name}-gtk-gnome = %{version} +Obsoletes: %{name}-gtk-gnome < %{version} + +%description -n canberra-gtk-play-gnome +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 .desktop files for the +gnome-desktop and gdm. +Currently there are no desktop-login, desktop-logout or session-ready +sounds in the freedesktop sound theme, so installing this will +require a different sound-theme for it to be operational. + + %package devel Summary:Portable sound event library -- Development files Group: Development/Libraries/C and C++ @@ -262,6 +282,8 @@ %files -n canberra-gtk-play %defattr(-,root,root) %{_bindir}/canberra-gtk-play + +%files -n canberra-gtk-play-gnome %dir %{_datadir}/gnome %dir %{_datadir}/gnome/autostart %{_datadir}/gnome/autostart/libcanberra-login-sound.desktop
commit libcanberra for openSUSE:Factory
Hello community, here is the log from the commit of package libcanberra for openSUSE:Factory checked in at 2013-02-07 14:23:54 Comparing /work/SRC/openSUSE:Factory/libcanberra (Old) and /work/SRC/openSUSE:Factory/.libcanberra.new (New) Package is libcanberra, Maintainer is gnome-maintain...@suse.de Changes: --- /work/SRC/openSUSE:Factory/libcanberra/libcanberra.changes 2012-11-26 18:59:14.0 +0100 +++ /work/SRC/openSUSE:Factory/.libcanberra.new/libcanberra.changes 2013-02-07 14:23:55.0 +0100 @@ -1,0 +2,7 @@ +Wed Feb 6 15:38:50 UTC 2013 - dims...@opensuse.org + +- Drop pkgconfig(gstreamer-1.0) BuildRequires: no longer build the + gstreamer backend. The default is PulseAudio, with a fallback to + alsa, which is sufficient. Helps against issues like bnc#800963. + +--- Other differences: -- ++ libcanberra.spec ++ --- /var/tmp/diff_new_pack.uOXClB/_old 2013-02-07 14:23:56.0 +0100 +++ /var/tmp/diff_new_pack.uOXClB/_new 2013-02-07 14:23:56.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package libcanberra # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -38,7 +38,6 @@ BuildRequires: update-desktop-files BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(glib-2.0) = 2.32 -BuildRequires: pkgconfig(gstreamer-1.0) BuildRequires: pkgconfig(gtk+-2.0) %if %build_gtk3 BuildRequires: pkgconfig(gtk+-3.0) @@ -224,7 +223,6 @@ %{_libdir}/libcanberra.so.* %dir %{_libdir}/libcanberra-%{version} %{_libdir}/libcanberra-%{version}/libcanberra-alsa.so -%{_libdir}/libcanberra-%{version}/libcanberra-gstreamer.so %{_libdir}/libcanberra-%{version}/libcanberra-multi.so %{_libdir}/libcanberra-%{version}/libcanberra-null.so %{_libdir}/libcanberra-%{version}/libcanberra-oss.so -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libcanberra for openSUSE:Factory
Hello community, here is the log from the commit of package libcanberra for openSUSE:Factory checked in at 2012-11-26 18:57:33 Comparing /work/SRC/openSUSE:Factory/libcanberra (Old) and /work/SRC/openSUSE:Factory/.libcanberra.new (New) Package is libcanberra, Maintainer is gnome-maintain...@suse.de Changes: --- /work/SRC/openSUSE:Factory/libcanberra/libcanberra.changes 2012-10-03 15:09:30.0 +0200 +++ /work/SRC/openSUSE:Factory/.libcanberra.new/libcanberra.changes 2012-11-26 18:59:14.0 +0100 @@ -1,0 +2,6 @@ +Fri Nov 9 18:27:56 UTC 2012 - michael.me...@suse.com + +- Add libcanberra-broadway-fix.patch: Fix crash with + libcanberra-gtk-module's and non-X11 displays (bnc#789066). + +--- New: libcanberra-broadway-fix.patch Other differences: -- ++ libcanberra.spec ++ --- /var/tmp/diff_new_pack.FBRXQf/_old 2012-11-26 18:59:21.0 +0100 +++ /var/tmp/diff_new_pack.FBRXQf/_new 2012-11-26 18:59:21.0 +0100 @@ -30,6 +30,8 @@ Source99: baselibs.conf #PATCH-FIX-UPSTREAM libcanberra-multi-backend.patch bnc#753243 fdo#51662 dims...@opensuse.org -- Set the multi backend as default and allow it actually to work. Patch0: libcanberra-multi-backend.patch +#PATCH-FIX-UPSTREAM libcanberra-broadway-fix.patch bnc#789066 michael.me...@suse.com -- mailed to lennart +Patch1: libcanberra-broadway-fix.patch BuildRequires: gtk-doc BuildRequires: libltdl-devel BuildRequires: lynx @@ -184,6 +186,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %configure --with-pic --disable-static --enable-pulse --enable-alsa --enable-null --with-builtin=dso V=1 ++ libcanberra-broadway-fix.patch ++ From c0620e432650e81062c1967cc669829dbd29b310 Mon Sep 17 00:00:00 2001 From: Michael Meeks michael.me...@suse.com Date: Fri, 9 Nov 2012 16:16:40 + Subject: [PATCH] gtk: Don't assume all GdkDisplays are GdkX11Displays: broadway/wayland --- src/canberra-gtk-module.c | 15 +++ src/canberra-gtk.c|5 + 2 files changed, 20 insertions(+), 0 deletions(-) diff --git a/src/canberra-gtk-module.c b/src/canberra-gtk-module.c index 67791f0..c1532ab 100644 --- a/src/canberra-gtk-module.c +++ b/src/canberra-gtk-module.c @@ -307,6 +307,11 @@ static gint window_get_desktop(GdkDisplay *d, GdkWindow *w) { guchar *data = NULL; gint ret = -1; +#ifdef GDK_IS_X11_DISPLAY +if (!GDK_IS_X11_DISPLAY(d)) +return 0; +#endif + if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), GDK_WINDOW_XID(w), gdk_x11_get_xatom_by_name_for_display(d, _NET_WM_DESKTOP), 0, G_MAXLONG, False, XA_CARDINAL, type_return, @@ -335,6 +340,11 @@ static gint display_get_desktop(GdkDisplay *d) { guchar *data = NULL; gint ret = -1; +#ifdef GDK_IS_X11_DISPLAY +if (!GDK_IS_X11_DISPLAY(d)) +return 0; +#endif + if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), DefaultRootWindow(GDK_DISPLAY_XDISPLAY(d)), gdk_x11_get_xatom_by_name_for_display(d, _NET_CURRENT_DESKTOP), 0, G_MAXLONG, False, XA_CARDINAL, type_return, @@ -365,6 +375,11 @@ static gboolean window_is_xembed(GdkDisplay *d, GdkWindow *w) { gboolean ret = FALSE; Atom xembed; +#ifdef GDK_IS_X11_DISPLAY +if (!GDK_IS_X11_DISPLAY(d)) +return FALSE; +#endif + /* Gnome Panel applets are XEMBED windows. We need to make sure we * ignore them */ diff --git a/src/canberra-gtk.c b/src/canberra-gtk.c index 34446f5..08cb668 100644 --- a/src/canberra-gtk.c +++ b/src/canberra-gtk.c @@ -185,6 +185,11 @@ static gint window_get_desktop(GdkDisplay *d, GdkWindow *w) { guchar *data = NULL; gint ret = -1; +#ifdef GDK_IS_X11_DISPLAY +if (!GDK_IS_X11_DISPLAY(d)) +return 0; +#endif + if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), GDK_WINDOW_XID(w), gdk_x11_get_xatom_by_name_for_display(d, _NET_WM_DESKTOP), 0, G_MAXLONG, False, XA_CARDINAL, type_return, -- 1.7.7 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libcanberra for openSUSE:Factory
Hello community, here is the log from the commit of package libcanberra for openSUSE:Factory checked in at 2012-10-03 15:09:22 Comparing /work/SRC/openSUSE:Factory/libcanberra (Old) and /work/SRC/openSUSE:Factory/.libcanberra.new (New) Package is libcanberra, Maintainer is gnome-maintain...@suse.de Changes: --- /work/SRC/openSUSE:Factory/libcanberra/libcanberra.changes 2012-07-03 13:57:20.0 +0200 +++ /work/SRC/openSUSE:Factory/.libcanberra.new/libcanberra.changes 2012-10-03 15:09:30.0 +0200 @@ -1,0 +2,22 @@ +Tue Sep 25 11:52:28 UTC 2012 - dims...@opensuse.org + +- Update to version 0.30: + + Minor bug fixes + + Explicitly require x11 for GTK linking + + Port to GStreamer 1.0. +- Add pkgconfig(glib-2.0) BuildRequires so it can be versioned. +- Add pkgconfig(x11) BuildRequires: new explicit dependency. +- Drop libcanberra-gst10.patch: fixed upstream. +- Drop libtool BuildRequires and call to ./autogen.sh: no patch + requires bootstrapping. + +--- +Mon Sep 3 16:07:52 UTC 2012 - dims...@opensuse.org + +- Add libcanberra-gst10.patch: Port libcanberra to GStreamer 1.0. +- Add libtool BuildRequires and call ./autogen.sh in build, as + above patch touches the build system +- Replace pkgconfig(gstreamer-0.10) BuildRequires with + pkgconfig(gstreamer-1.0). + +--- Old: libcanberra-0.29.tar.xz New: libcanberra-0.30.tar.xz Other differences: -- ++ libcanberra.spec ++ --- /var/tmp/diff_new_pack.0ksg1v/_old 2012-10-03 15:09:31.0 +0200 +++ /var/tmp/diff_new_pack.0ksg1v/_new 2012-10-03 15:09:31.0 +0200 @@ -19,7 +19,7 @@ %define build_gtk3 1 Name: libcanberra -Version:0.29 +Version:0.30 Release:0 Summary:Portable sound event library License:LGPL-2.0+ @@ -28,20 +28,22 @@ Source: http://0pointer.de/lennart/projects/libcanberra/%{name}-%{version}.tar.xz Source1:libcanberra-gtk-module.sh Source99: baselibs.conf -#PATCH-FIX-UPSTREAM libcanberra-multi-backend.patch bnc#753243 dims...@opensuse.org -- Set the multi backend as default and allow it actually to work. +#PATCH-FIX-UPSTREAM libcanberra-multi-backend.patch bnc#753243 fdo#51662 dims...@opensuse.org -- Set the multi backend as default and allow it actually to work. Patch0: libcanberra-multi-backend.patch BuildRequires: gtk-doc BuildRequires: libltdl-devel BuildRequires: lynx BuildRequires: update-desktop-files BuildRequires: pkgconfig(alsa) -BuildRequires: pkgconfig(gstreamer-0.10) +BuildRequires: pkgconfig(glib-2.0) = 2.32 +BuildRequires: pkgconfig(gstreamer-1.0) BuildRequires: pkgconfig(gtk+-2.0) %if %build_gtk3 BuildRequires: pkgconfig(gtk+-3.0) %endif BuildRequires: pkgconfig(libpulse) = 0.9.11 BuildRequires: pkgconfig(vorbisfile) +BuildRequires: pkgconfig(x11) BuildRoot: %{_tmppath}/%{name}-%{version}-build %define debug_package_requires libcanberra0 = %{version}-%{release} -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libcanberra for openSUSE:Factory
Hello community, here is the log from the commit of package libcanberra for openSUSE:Factory checked in at 2012-07-03 13:57:19 Comparing /work/SRC/openSUSE:Factory/libcanberra (Old) and /work/SRC/openSUSE:Factory/.libcanberra.new (New) Package is libcanberra, Maintainer is gnome-maintain...@suse.de Changes: --- /work/SRC/openSUSE:Factory/libcanberra/libcanberra.changes 2012-07-02 21:24:06.0 +0200 +++ /work/SRC/openSUSE:Factory/.libcanberra.new/libcanberra.changes 2012-07-03 13:57:20.0 +0200 @@ -1,0 +2,7 @@ +Mon Jul 2 19:19:56 UTC 2012 - dims...@opensuse.org + +- Add libcanberra-multi-backend.patch: Set the 'multi'-backend as + default and fix it to also work without the driver list being + passed from the command line. Fixes bnc#763243. + +--- New: libcanberra-multi-backend.patch Other differences: -- ++ libcanberra.spec ++ --- /var/tmp/diff_new_pack.F1U3F8/_old 2012-07-03 13:57:21.0 +0200 +++ /var/tmp/diff_new_pack.F1U3F8/_new 2012-07-03 13:57:21.0 +0200 @@ -28,6 +28,8 @@ Source: http://0pointer.de/lennart/projects/libcanberra/%{name}-%{version}.tar.xz Source1:libcanberra-gtk-module.sh Source99: baselibs.conf +#PATCH-FIX-UPSTREAM libcanberra-multi-backend.patch bnc#753243 dims...@opensuse.org -- Set the multi backend as default and allow it actually to work. +Patch0: libcanberra-multi-backend.patch BuildRequires: gtk-doc BuildRequires: libltdl-devel BuildRequires: lynx @@ -179,6 +181,7 @@ %prep %setup -q +%patch0 -p1 %build %configure --with-pic --disable-static --enable-pulse --enable-alsa --enable-null --with-builtin=dso V=1 ++ libcanberra-multi-backend.patch ++ Index: libcanberra-0.29/src/driver-order.c === --- libcanberra-0.29.orig/src/driver-order.c +++ libcanberra-0.29/src/driver-order.c @@ -30,6 +30,7 @@ #include driver-order.h const char* const ca_driver_order[] = { + multi, #ifdef HAVE_PULSE pulse, #endif Index: libcanberra-0.29/src/multi.c === --- libcanberra-0.29.orig/src/multi.c +++ libcanberra-0.29/src/multi.c @@ -107,8 +107,7 @@ int driver_open(ca_context *c) { int ret = CA_SUCCESS; ca_return_val_if_fail(c, CA_ERROR_INVALID); -ca_return_val_if_fail(c-driver, CA_ERROR_NODRIVER); -ca_return_val_if_fail(!strncmp(c-driver, multi, 5), CA_ERROR_NODRIVER); +ca_return_val_if_fail(!c-driver || strncmp(c-driver, multi, 5) == 0, CA_ERROR_NODRIVER); ca_return_val_if_fail(!PRIVATE(c), CA_ERROR_STATE); if (!(c-private = p = ca_new0(struct private, 1))) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libcanberra for openSUSE:Factory
Hello community, here is the log from the commit of package libcanberra for openSUSE:Factory checked in at 2012-07-02 21:24:03 Comparing /work/SRC/openSUSE:Factory/libcanberra (Old) and /work/SRC/openSUSE:Factory/.libcanberra.new (New) Package is libcanberra, Maintainer is gnome-maintain...@suse.de Changes: --- /work/SRC/openSUSE:Factory/libcanberra/libcanberra.changes 2012-05-22 10:10:29.0 +0200 +++ /work/SRC/openSUSE:Factory/.libcanberra.new/libcanberra.changes 2012-07-02 21:24:06.0 +0200 @@ -1,0 +2,9 @@ +Mon Jul 2 09:51:09 UTC 2012 - dims...@opensuse.org + +- Add # to be sourced to libcanberra-gtk-module.sh (bnc#750980). + Xinitrc newly distinguishes between scripts that need to be + sourced and scripts that should be executed. As executing is the + default, scripts need to 'request to be sourced' using this + special tag. + +--- Other differences: -- ++ libcanberra-gtk-module.sh ++ --- /var/tmp/diff_new_pack.ZNoW0l/_old 2012-07-02 21:24:07.0 +0200 +++ /var/tmp/diff_new_pack.ZNoW0l/_new 2012-07-02 21:24:07.0 +0200 @@ -1,5 +1,7 @@ #!/bin/sh +# to be sourced + if [ -z $GTK_MODULES ] ; then GTK_MODULES=canberra-gtk-module else -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libcanberra for openSUSE:Factory
Hello community, here is the log from the commit of package libcanberra for openSUSE:Factory checked in at 2012-05-22 10:10:27 Comparing /work/SRC/openSUSE:Factory/libcanberra (Old) and /work/SRC/openSUSE:Factory/.libcanberra.new (New) Package is libcanberra, Maintainer is gnome-maintain...@suse.de Changes: --- /work/SRC/openSUSE:Factory/libcanberra/libcanberra.changes 2012-01-09 15:42:19.0 +0100 +++ /work/SRC/openSUSE:Factory/.libcanberra.new/libcanberra.changes 2012-05-22 10:10:29.0 +0200 @@ -1,0 +2,9 @@ +Wed May 16 06:11:59 UTC 2012 - vu...@opensuse.org + +- Update to version 0.29: + + Drop GConf usage. + + A couple of bugfixes. +- Drop pkgconfig(gconf-2.0) BuildRequires and gconf schemas + packaging, as GConf usage got removed upstream. + +--- Old: libcanberra-0.28.tar.bz2 New: libcanberra-0.29.tar.xz Other differences: -- ++ libcanberra.spec ++ --- /var/tmp/diff_new_pack.3M5hDy/_old 2012-05-22 10:10:32.0 +0200 +++ /var/tmp/diff_new_pack.3M5hDy/_new 2012-05-22 10:10:32.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package libcanberra # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,16 +15,17 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define build_gtk3 1 Name: libcanberra -Version:0.28 +Version:0.29 Release:0 Summary:Portable sound event library License:LGPL-2.0+ Group: System/Libraries Url:http://0pointer.de/lennart/projects/libcanberra/ -Source: libcanberra-%{version}.tar.bz2 +Source: http://0pointer.de/lennart/projects/libcanberra/%{name}-%{version}.tar.xz Source1:libcanberra-gtk-module.sh Source99: baselibs.conf BuildRequires: gtk-doc @@ -32,7 +33,6 @@ BuildRequires: lynx BuildRequires: update-desktop-files BuildRequires: pkgconfig(alsa) -BuildRequires: pkgconfig(gconf-2.0) BuildRequires: pkgconfig(gstreamer-0.10) BuildRequires: pkgconfig(gtk+-2.0) %if %build_gtk3 @@ -99,7 +99,6 @@ %if %build_gtk3 Recommends: %{name}-gtk3-module %endif -%gconf_schemas_prereq %description gtk-module-common libcanberra is an implementation of the XDG Sound Theme and Name @@ -192,7 +191,6 @@ %suse_update_desktop_file %{buildroot}%{_datadir}/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop install -D -m755 %{SOURCE1} %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/libcanberra-gtk-module.sh rm %{buildroot}%{_datadir}/doc/libcanberra/README -%find_gconf_schemas %clean rm -rf %{buildroot} @@ -212,12 +210,6 @@ %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) %doc README LGPL @@ -241,7 +233,7 @@ %{_libdir}/libcanberra-gtk3.so.* %endif -%files gtk-module-common -f %{name}.schemas_list +%files gtk-module-common %defattr(-, root, root) %dir %{_sysconfdir}/X11/xinit %dir %{_sysconfdir}/X11/xinit/xinitrc.d -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libcanberra for openSUSE:Factory
Hello community, here is the log from the commit of package libcanberra for openSUSE:Factory checked in at 2012-01-09 15:42:16 Comparing /work/SRC/openSUSE:Factory/libcanberra (Old) and /work/SRC/openSUSE:Factory/.libcanberra.new (New) Package is libcanberra, Maintainer is gnome-maintain...@suse.de Changes: --- /work/SRC/openSUSE:Factory/libcanberra/libcanberra.changes 2011-09-23 02:07:53.0 +0200 +++ /work/SRC/openSUSE:Factory/.libcanberra.new/libcanberra.changes 2012-01-09 15:42:19.0 +0100 @@ -1,0 +2,8 @@ +Sun Dec 4 13:45:30 UTC 2011 - dims...@opensuse.org + +- Add libltdl-devel BuildRequires: it is required and was + implicitly brought in before. +- Change gconf2-devel BuildRequires to pkgconfig(gconf-2.0). +- Clean spec file using spec-cleaner. + +--- Other differences: -- ++ libcanberra.spec ++ --- /var/tmp/diff_new_pack.SEHdlN/_old 2012-01-09 15:42:20.0 +0100 +++ /var/tmp/diff_new_pack.SEHdlN/_new 2012-01-09 15:42:20.0 +0100 @@ -15,24 +15,24 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - %define build_gtk3 1 Name: libcanberra Version:0.28 -Release:3 -License:LGPLv2.0+ +Release:0 Summary:Portable sound event library -Url:http://0pointer.de/lennart/projects/libcanberra/ +License:LGPL-2.0+ Group: System/Libraries +Url:http://0pointer.de/lennart/projects/libcanberra/ Source: libcanberra-%{version}.tar.bz2 Source1:libcanberra-gtk-module.sh Source99: baselibs.conf -BuildRequires: gconf2-devel BuildRequires: gtk-doc +BuildRequires: libltdl-devel BuildRequires: lynx BuildRequires: update-desktop-files BuildRequires: pkgconfig(alsa) +BuildRequires: pkgconfig(gconf-2.0) BuildRequires: pkgconfig(gstreamer-0.10) BuildRequires: pkgconfig(gtk+-2.0) %if %build_gtk3 @@ -50,7 +50,6 @@ designed to be portable. %package -n libcanberra0 -License:LGPLv2.0+ Summary:Portable sound event library Group: System/Libraries Requires: libpulse0 = 0.9.11 @@ -65,7 +64,6 @@ This package contains the main library. %packagegtk0 -License:LGPLv2.0+ Summary:Portable sound event library -- GTK+ 2 Library Group: System/Libraries @@ -81,8 +79,6 @@ %if %build_gtk3 %package gtk3-0 -License:LGPLv2.0+ - Summary:Portable sound event library -- GTK+ 3 Library Group: System/Libraries @@ -97,7 +93,6 @@ %endif %package gtk-module-common -License:LGPLv2.0+ Summary:Portable sound event library -- Common Files for GTK+ Modules Group: System/Libraries Recommends: %{name}-gtk2-module @@ -116,7 +111,6 @@ modules. %package gtk2-module -License:LGPLv2.0+ Summary:Portable sound event library -- GTK+ 2 Module Group: System/Libraries Requires: %{name}-gtk-module-common = %{version} @@ -134,7 +128,6 @@ %if %build_gtk3 %package gtk3-module -License:LGPLv2.0+ Summary:Portable sound event library -- GTK+ 3 Module Group: System/Libraries Requires: %{name}-gtk-module-common = %{version} @@ -151,15 +144,14 @@ %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 +# This package contains login/logout sound for GNOME +Supplements:gnome-session +Provides: %{name}-gtk = %{version} +Obsoletes: %{name}-gtk %{version} %description -n canberra-gtk-play libcanberra is an implementation of the XDG Sound Theme and Name @@ -170,11 +162,10 @@ This package provides the canberra-gtk-play utility. %package devel -License:LGPLv2.0+ Summary:Portable sound event library -- Development files Group: Development/Libraries/C and C++ -Requires: libcanberra0 = %{version} Requires: libcanberra-gtk0 = %{version} +Requires: libcanberra0 = %{version} %if %build_gtk3 Requires: libcanberra-gtk3-0 = %{version} %endif @@ -192,10 +183,10 @@ %build %configure --with-pic --disable-static --enable-pulse --enable-alsa --enable-null --with-builtin=dso V=1 -%__make %{?jobs:-j%jobs} +make %{?_smp_mflags} %install -%makeinstall +%make_install find %{buildroot}%{_libdir} -name '*.la' -delete -print %suse_update_desktop_file
commit libcanberra for openSUSE:Factory
Hello community, here is the log from the commit of package libcanberra for openSUSE:Factory checked in at Fri Aug 12 13:32:53 CEST 2011. calling whatdependson for head-i586 Other differences: -- ++ libcanberra.spec ++ --- /var/tmp/diff_new_pack.AXHKRo/_old 2011-08-12 13:32:39.0 +0200 +++ /var/tmp/diff_new_pack.AXHKRo/_new 2011-08-12 13:32:39.0 +0200 @@ -20,7 +20,7 @@ Name: libcanberra Version:0.28 -Release:1 +Release:3 License:LGPLv2.0+ Summary:Portable sound event library Url:http://0pointer.de/lennart/projects/libcanberra/ @@ -90,7 +90,7 @@ 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. This package contains a library to make it easier to use libcanberra from GTK+ 3 applications. @@ -110,7 +110,7 @@ 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. This package contains files common to both the GTK+ 2 and GTK+ 3 modules. @@ -126,7 +126,7 @@ 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. This package contains a GTK+ 2 module that triggers input feedback event sounds. @@ -144,7 +144,7 @@ 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. This package contains a GTK+ 3 module that triggers input feedback event sounds. Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libcanberra for openSUSE:Factory
Hello community, here is the log from the commit of package libcanberra for openSUSE:Factory checked in at Mon May 2 15:16:00 CEST 2011. --- GNOME/libcanberra/libcanberra.changes 2010-10-05 10:28:03.0 +0200 +++ /mounts/work_src_done/STABLE/libcanberra/libcanberra.changes 2011-04-21 11:34:16.0 +0200 @@ -1,0 +2,33 @@ +Mon Mar 7 15:34:08 UTC 2011 - fcro...@novell.com + +- Fix directory ownership of + %{_libdir}/gnome-settings-daemon-3.0/gtk-modules in + gtk-module-common. +- Remove --disable-rpath configure option: it's obsolete. + +--- +Wed Mar 2 16:06:54 CET 2011 - fcro...@novell.com + +- Update to version 0.28: + + enable gtk module by default in gnome3 + + update login autostart files for gnome3 +- Stop making libcanberra-gtk-module-common noarch as there's a + file in %{_libdir}. + +--- +Fri Feb 18 12:28:26 UTC 2011 - fcro...@novell.com + +- Update to version 0.27: + + add utility to play boot up sound + + systemd: add unit for bootup and shutdown sounds + + cache: don't use $HOME when it is not set + + gtk3: skip gtk_quit_add() for now +- Remove libcanberra-gtkquit.patch: fixed upstream + +--- +Tue Feb 15 15:47:54 UTC 2011 - fcro...@novell.com + +- Enable gtk+ 3 build by setting build_gtk3 to 1. +- Add libcanberra-gtkquit.patch: do not use removed GTK+ 3 API. + +--- calling whatdependson for head-i586 Old: libcanberra-0.26.tar.bz2 New: libcanberra-0.28.tar.bz2 Other differences: -- ++ libcanberra.spec ++ --- /var/tmp/diff_new_pack.q0PO9W/_old 2011-05-02 15:14:45.0 +0200 +++ /var/tmp/diff_new_pack.q0PO9W/_new 2011-05-02 15:14:45.0 +0200 @@ -1,7 +1,7 @@ # -# spec file for package libcanberra (Version 0.26) +# spec file for package libcanberra # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,10 +16,10 @@ # -%define build_gtk3 0 +%define build_gtk3 1 Name: libcanberra -Version:0.26 +Version:0.28 Release:1 License:LGPLv2.0+ Summary:Portable sound event library @@ -81,7 +81,7 @@ %if %build_gtk3 %package gtk3-0 - +License:LGPLv2.0+ Summary:Portable sound event library -- GTK+ 3 Library Group: System/Libraries @@ -104,7 +104,6 @@ %if %build_gtk3 Recommends: %{name}-gtk3-module %endif -BuildArch: noarch %gconf_schemas_prereq %description gtk-module-common @@ -135,8 +134,7 @@ %if %build_gtk3 %package gtk3-module - - +License:LGPLv2.0+ Summary:Portable sound event library -- GTK+ 3 Module Group: System/Libraries Requires: %{name}-gtk-module-common = %{version} @@ -193,7 +191,7 @@ %setup -q %build -%configure --with-pic --disable-static --disable-rpath --enable-pulse --enable-alsa --enable-null --with-builtin=dso +%configure --with-pic --disable-static --enable-pulse --enable-alsa --enable-null --with-builtin=dso V=1 %__make %{?jobs:-j%jobs} %install @@ -257,6 +255,9 @@ %dir %{_sysconfdir}/X11/xinit %dir %{_sysconfdir}/X11/xinit/xinitrc.d %{_sysconfdir}/X11/xinit/xinitrc.d/libcanberra-gtk-module.sh +%dir %{_libdir}/gnome-settings-daemon-3.0 +%dir %{_libdir}/gnome-settings-daemon-3.0/gtk-modules +%{_libdir}/gnome-settings-daemon-3.0/gtk-modules/canberra-gtk-module.desktop %files gtk2-module %defattr(-, root, root) ++ libcanberra-0.26.tar.bz2 - libcanberra-0.28.tar.bz2 ++ 23310 lines of diff (skipped) Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org