Accepting request 99087 from GNOME:Factory

Pushing G:F

OBS-URL: https://build.opensuse.org/request/show/99087
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libcanberra?expand=0&rev=29

libcanberra.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sun Dec  4 13:45:30 UTC 2011 - dimstar@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.
+
 -------------------------------------------------------------------
 Mon Mar  7 15:34:08 UTC 2011 - fcrozat@novell.com
 

libcanberra.spec

@@ -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
+Release:        0
-License:        LGPLv2.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 @@ 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 +64,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 +79,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 +93,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 +111,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 +128,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 +144,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 +162,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 +183,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