From 1f5b0cb8ec567796a889fdfe4d286a99edfe21c523c2036b6286590cc1adf611 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sun, 4 Dec 2011 13:51:18 +0000 Subject: [PATCH 1/2] Accepting request 95323 from home:dimstar:branches:GNOME:Factory Fix build in G:F: add libltdl-devek buildrequires and just some housekeeping OBS-URL: https://build.opensuse.org/request/show/95323 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libcanberra?expand=0&rev=44 --- libcanberra.changes | 9 +++++++++ libcanberra.spec | 30 +++++++++++------------------- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/libcanberra.changes b/libcanberra.changes index 4b31afd..bb27d6b 100644 --- a/libcanberra.changes +++ b/libcanberra.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sun Dec 4 13:45:30 UTC 2011 - dimstar@opensuse.org + +- Add libltdl-devel BuildRequires. Libtool is no longer part of the + default chroot. +- Clean spec file using spec-cleaner. +- Change License tag to spdx identifier and remove duplicate + entries. + ------------------------------------------------------------------- Mon Mar 7 15:34:08 UTC 2011 - fcrozat@novell.com diff --git a/libcanberra.spec b/libcanberra.spec index 920c9f2..8158890 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -20,19 +20,20 @@ Name: libcanberra Version: 0.28 -Release: 1 -License: LGPLv2.0+ +Release: 3 +License: LGPL-2.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: 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 +51,6 @@ 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 Group: System/Libraries Requires: libpulse0 >= 0.9.11 @@ -65,7 +65,6 @@ designed to be portable. This package contains the main library. %package gtk0 -License: LGPLv2.0+ Summary: Portable sound event library -- GTK+ 2 Library Group: System/Libraries @@ -81,8 +80,6 @@ libcanberra from GTK+ 2 applications. %if %build_gtk3 %package gtk3-0 -License: LGPLv2.0+ - Summary: Portable sound event library -- GTK+ 3 Library Group: System/Libraries @@ -97,7 +94,6 @@ libcanberra from GTK+ 3 applications. %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 +112,6 @@ 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} @@ -134,7 +129,6 @@ event sounds. %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 +145,14 @@ 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 +# 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 +163,10 @@ designed to be portable. 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 +184,10 @@ This package provides the development files for libcanberra. %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 %{buildroot}%{_datadir}/gnome/autostart/libcanberra-login-sound.desktop %suse_update_desktop_file %{buildroot}%{_datadir}/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop From 076ba788d26954058e05ceaacaff6fbd2fd366dac8e3f3056bc4ce925ca8bfbe Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Wed, 21 Dec 2011 04:22:54 +0000 Subject: [PATCH 2/2] Accepting request 97447 from home:vuntz:branches:GNOME:Factory tweak OBS-URL: https://build.opensuse.org/request/show/97447 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libcanberra?expand=0&rev=45 --- libcanberra.changes | 7 +++---- libcanberra.spec | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/libcanberra.changes b/libcanberra.changes index bb27d6b..3854783 100644 --- a/libcanberra.changes +++ b/libcanberra.changes @@ -1,11 +1,10 @@ ------------------------------------------------------------------- Sun Dec 4 13:45:30 UTC 2011 - dimstar@opensuse.org -- Add libltdl-devel BuildRequires. Libtool is no longer part of the - default chroot. +- 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. -- Change License tag to spdx identifier and remove duplicate - entries. ------------------------------------------------------------------- Mon Mar 7 15:34:08 UTC 2011 - fcrozat@novell.com diff --git a/libcanberra.spec b/libcanberra.spec index 8158890..1338537 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -15,16 +15,15 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - %define build_gtk3 1 Name: libcanberra Version: 0.28 -Release: 3 -License: LGPL-2.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