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
This commit is contained in:
Vincent Untz 2010-08-09 10:32:46 +00:00 committed by Git OBS Bridge
parent 68f652dc73
commit 5b985e6974
2 changed files with 29 additions and 1 deletions

View File

@ -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

View File

@ -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