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

@@ -1,6 +1,7 @@
 libcanberra0
 libcanberra-gtk0
-libcanberra-gtk
-  supplements "packageand(libcanberra-gtk:gtk2-<targettype>)"
 libcanberra-gtk3-0
-libcanberra-gtk3
+libcanberra-gtk2-module
+  supplements "packageand(libcanberra0:gtk2-<targettype>)"
+libcanberra-gtk3-module
+  supplements "packageand(libcanberra0:gtk3-<targettype>)"

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
+  + build fixes
-  + docs: update for 0.25
+- Add gtk3-devel BuildRequires.
-  + git: ignore more files
+- Create gtk3-0 and gtk3 subpackages for GTK+ 3 support.
-  + 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

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
+This package contains 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
+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
-
-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
+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
+%package gtk-module-common
-   libcanberra from Gtk+ applications
+Summary:        Portable sound event library -- Common Files for GTK+ Modules
-
-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
-
+Recommends:     %{name}-gtk2-module
-%description gtk3
+Recommends:     %{name}-gtk3-module
-libcanberra is an implementation of the XDG Sound Theme and Name
+BuildArch:      noarch
-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}
 %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
+%package gtk2-module
-   libcanberra from Gtk+ applications
+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
+%description gtk2-module
-trigger input feedback event sounds
+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:       libcanberra0 = %{version}
-Requires:       gtk2-devel
 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
+This package provides the development files for libcanberra.
-
-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
@@ -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
+%files gtk3-0
-%defattr(-,root,root)
+%defattr(-, root, root)
-%{_libdir}/gtk-2.0/modules/libcanberra-gtk-module.so
+%{_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
+%{_includedir}/canberra-gtk.h
-%{_libdir}/libcanberra-gtk.so
 %{_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