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.000000000 +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 backends (ALSA, PulseAudio, null)
+and is designed to be portable.
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
%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.
+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 files common to both the GTK+ 2 and GTK+ 3
modules.
@@ -121,15 +111,13 @@
%description gtk2-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.
+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 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
@@ -138,13 +126,12 @@
%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.
+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 GTK+ 3 module that triggers input feedback
event sounds.
-%endif
%package -n canberra-gtk-play
Summary: Portable sound event library -- Utility
@@ -154,35 +141,34 @@
%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.
+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 -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
+# This package contains login/logout sound for GNOME.
#Supplements: gnome-session
+Group: System/Libraries
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.
+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.
-
+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
@@ -191,29 +177,26 @@
%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.
+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 -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.
+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-gtk3
+This package provides the development files for libcanberra-gtk3.
%package -n libcanberra-gtk-devel
Summary: Portable sound event library -- Development files
@@ -224,31 +207,37 @@
%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.
+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
+This package provides the development files for libcanberra-gtk2.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
+cp %{SOURCE1} libcanberra-gtk-module.sh
%build
-%configure --with-pic --disable-static --enable-pulse --enable-alsa
--enable-null --with-builtin=dso V=1
-make %{?_smp_mflags}
+%configure \
+ --disable-static \
+ --enable-pulse \
+ --enable-alsa \
+ --enable-null \
+ --with-builtin=dso
+make %{?_smp_mflags} V=1
%install
%make_install
-find %{buildroot}%{_libdir} -name '*.la' -delete -print
+install -Dpm 0755 libcanberra-gtk-module.sh \
+ %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/libcanberra-gtk-module.sh
+rm %{buildroot}%{_datadir}/doc/libcanberra/README
+
%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
-install -D -m755 %{SOURCE1}
%{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/libcanberra-gtk-module.sh
-rm %{buildroot}%{_datadir}/doc/libcanberra/README
-%clean
-rm -rf %{buildroot}
+find %{buildroot} -type f -name "*.la" -delete -print
%post -n libcanberra0 -p /sbin/ldconfig
@@ -258,18 +247,15 @@
%postun gtk0 -p /sbin/ldconfig
-%if %build_gtk3
-
%post gtk3-0 -p /sbin/ldconfig
%postun gtk3-0 -p /sbin/ldconfig
-%endif
%files -n libcanberra0
%defattr(-,root,root)
%doc README LGPL
%{_libdir}/libcanberra.so.*
-%dir %{_libdir}/libcanberra-%{version}
+%dir %{_libdir}/libcanberra-%{version}/
%{_libdir}/libcanberra-%{version}/libcanberra-alsa.so
%{_libdir}/libcanberra-%{version}/libcanberra-multi.so
%{_libdir}/libcanberra-%{version}/libcanberra-null.so
@@ -280,46 +266,41 @@
%defattr(-,root,root)
%{_libdir}/libcanberra-gtk.so.*
-%if %build_gtk3
-
%files gtk3-0
-%defattr(-, root, root)
+%defattr(-,root,root)
%{_libdir}/libcanberra-gtk3.so.*
-%endif
%files gtk-module-common
-%defattr(-, root, root)
-%dir %{_sysconfdir}/X11/xinit
-%dir %{_sysconfdir}/X11/xinit/xinitrc.d
+%defattr(-,root,root)
+%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
+%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)
+%defattr(-,root,root)
%{_libdir}/gtk-2.0/modules/libcanberra-gtk-module.so
-%if %build_gtk3
-
%files gtk3-module
-%defattr(-, root, root)
+%defattr(-,root,root)
%{_libdir}/gtk-3.0/modules/libcanberra-gtk*-module.so
-%endif
%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
+%defattr(-,root,root)
+%dir %{_datadir}/gnome/
+%dir %{_datadir}/gnome/autostart/
%{_datadir}/gnome/autostart/libcanberra-login-sound.desktop
-%dir %{_datadir}/gnome/shutdown
+%dir %{_datadir}/gnome/shutdown/
%{_datadir}/gnome/shutdown/libcanberra-logout-sound.sh
-%dir %{_datadir}/gdm
-%dir %{_datadir}/gdm/autostart
-%dir %{_datadir}/gdm/autostart/LoginWindow
+%dir %{_datadir}/gdm/
+%dir %{_datadir}/gdm/autostart/
+%dir %{_datadir}/gdm/autostart/LoginWindow/
%{_datadir}/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop
%files -n libcanberra-gtk-devel
@@ -327,23 +308,20 @@
%{_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
+%doc %{_datadir}/gtk-doc/html/libcanberra/
%{_includedir}/canberra.h
%{_includedir}/canberra-gtk.h
%{_libdir}/libcanberra.so
%{_libdir}/pkgconfig/libcanberra.pc
-%dir %{_datadir}/vala
-%dir %{_datadir}/vala/vapi
+%dir %{_datadir}/vala/
+%dir %{_datadir}/vala/vapi/
%{_datadir}/vala/vapi/*.vapi
%changelog
