From a85292670a00d69157dce574d86a20beb24cf18f Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Mon, 24 Sep 2012 17:52:24 +0200 Subject: [PATCH 1/3] Disable the GStreamer backend, it's not used in Fedora --- libcanberra.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libcanberra.spec b/libcanberra.spec index d69c26d..a873146 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,6 +1,6 @@ Name: libcanberra Version: 0.29 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Portable Sound Event Library Group: System Environment/Libraries Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz @@ -14,7 +14,6 @@ BuildRequires: libvorbis-devel BuildRequires: libtool-ltdl-devel BuildRequires: gtk-doc BuildRequires: pulseaudio-libs-devel >= 0.9.15 -BuildRequires: gstreamer-devel BuildRequires: libtdb-devel BuildRequires: gettext-devel BuildRequires: systemd-devel @@ -76,7 +75,7 @@ Development Files for libcanberra Client Development %setup -q %build -%configure --disable-static --enable-pulse --enable-alsa --enable-null --enable-gstreamer --disable-oss --with-builtin=dso --with-systemdsystemunitdir=/usr/lib/systemd/system +%configure --disable-static --enable-pulse --enable-alsa --enable-null --disable-oss --with-builtin=dso --with-systemdsystemunitdir=/usr/lib/systemd/system make %{?_smp_mflags} %install @@ -93,7 +92,6 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_libdir}/libcanberra-%{version}/libcanberra-pulse.so %{_libdir}/libcanberra-%{version}/libcanberra-null.so %{_libdir}/libcanberra-%{version}/libcanberra-multi.so -%{_libdir}/libcanberra-%{version}/libcanberra-gstreamer.so %{_prefix}/lib/systemd/system/canberra-system-bootup.service %{_prefix}/lib/systemd/system/canberra-system-shutdown-reboot.service %{_prefix}/lib/systemd/system/canberra-system-shutdown.service @@ -140,6 +138,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Mon Sep 24 2012 Bastien Nocera 0.29-6 +- Disable the GStreamer backend, it's not used in Fedora + * Fri Sep 14 2012 Lennart Poettering - 0.29-5 - Use systemd macros From 4e457604b198e733f49094ec74dbb9582bcfbb90 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 25 Sep 2012 02:41:27 +0200 Subject: [PATCH 2/3] New upstream release --- .gitignore | 1 + libcanberra.spec | 11 ++++++++--- sources | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index f45f91f..32e0682 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /libcanberra-0.28.tar.gz /libcanberra-0.*/ /libcanberra-0.29.tar.xz +/libcanberra-0.30.tar.xz diff --git a/libcanberra.spec b/libcanberra.spec index a873146..2a93bbd 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,6 +1,6 @@ Name: libcanberra -Version: 0.29 -Release: 6%{?dist} +Version: 0.30 +Release: 1%{?dist} Summary: Portable Sound Event Library Group: System Environment/Libraries Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz @@ -14,6 +14,7 @@ BuildRequires: libvorbis-devel BuildRequires: libtool-ltdl-devel BuildRequires: gtk-doc BuildRequires: pulseaudio-libs-devel >= 0.9.15 +BuildRequires: gstreamer1-devel BuildRequires: libtdb-devel BuildRequires: gettext-devel BuildRequires: systemd-devel @@ -75,7 +76,7 @@ Development Files for libcanberra Client Development %setup -q %build -%configure --disable-static --enable-pulse --enable-alsa --enable-null --disable-oss --with-builtin=dso --with-systemdsystemunitdir=/usr/lib/systemd/system +%configure --disable-static --enable-pulse --enable-alsa --enable-null --enable-gstreamer --disable-oss --with-builtin=dso --with-systemdsystemunitdir=/usr/lib/systemd/system make %{?_smp_mflags} %install @@ -92,6 +93,7 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_libdir}/libcanberra-%{version}/libcanberra-pulse.so %{_libdir}/libcanberra-%{version}/libcanberra-null.so %{_libdir}/libcanberra-%{version}/libcanberra-multi.so +%{_libdir}/libcanberra-%{version}/libcanberra-gstreamer.so %{_prefix}/lib/systemd/system/canberra-system-bootup.service %{_prefix}/lib/systemd/system/canberra-system-shutdown-reboot.service %{_prefix}/lib/systemd/system/canberra-system-shutdown.service @@ -138,6 +140,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Tue Sep 25 2012 Lennart Poettering - 0.30-1 +- New upstream release + * Mon Sep 24 2012 Bastien Nocera 0.29-6 - Disable the GStreamer backend, it's not used in Fedora diff --git a/sources b/sources index 25ecf0b..2025f13 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2594093a5d61047bd9cc87e955f86df8 libcanberra-0.29.tar.xz +34cb7e4430afaf6f447c4ebdb9b42072 libcanberra-0.30.tar.xz From c169ed03514dfacccfe002dec935579452739c8c Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 29 Oct 2012 22:43:21 -0400 Subject: [PATCH 3/3] fix multilib issue --- libcanberra.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/libcanberra.spec b/libcanberra.spec index 2a93bbd..f41f953 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,6 +1,6 @@ Name: libcanberra Version: 0.30 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Portable Sound Event Library Group: System Environment/Libraries Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz @@ -31,9 +31,9 @@ A small and lightweight implementation of the XDG Sound Theme Specification %package gtk2 Summary: Gtk+ 2.x Bindings for libcanberra Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} # Some other stuff is included in the gtk3 package, so always pull that in. -Requires: %{name}-gtk3 = %{version}-%{release} +Requires: %{name}-gtk3%{?_isa} = %{version}-%{release} %description gtk2 Gtk+ 2.x bindings for libcanberra @@ -41,7 +41,7 @@ Gtk+ 2.x bindings for libcanberra %package gtk3 Summary: Gtk+ 3.x Bindings for libcanberra Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description gtk3 Gtk+ 3.x bindings for libcanberra @@ -49,7 +49,7 @@ Gtk+ 3.x bindings for libcanberra %package devel Summary: Development Files for libcanberra Client Development Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} Requires: gtk2-devel %description devel @@ -140,6 +140,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Mon Oct 29 2012 Matthias Clasen - 0.30-2 +- Add %%{_isa} as required to fix multilib issues + * Tue Sep 25 2012 Lennart Poettering - 0.30-1 - New upstream release