From db97bfa9361f1d8f127b686d6a728ff0f1cb9016 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 17 Feb 2010 01:50:13 +0000 Subject: [PATCH 01/78] Initialize branch F-13 for libcanberra --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..baa94ef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-13 From 6f8060148c05730c1e256bc57d498fe270e86f89 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sat, 20 Feb 2010 16:54:23 +0000 Subject: [PATCH 02/78] 0.23 --- .cvsignore | 2 +- libcanberra.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 0cc410f..1dca496 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libcanberra-0.22.tar.gz +libcanberra-0.23.tar.gz diff --git a/libcanberra.spec b/libcanberra.spec index e80a3eb..979cc0e 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,5 +1,5 @@ Name: libcanberra -Version: 0.22 +Version: 0.23 Release: 1%{?dist} Summary: Portable Sound Event Library Group: System Environment/Libraries @@ -127,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Sat Feb 20 2010 Lennart Poettering 0.23-1 +- New version 0.23 + * Tue Oct 20 2009 Lennart Poettering 0.22-1 - New version 0.22 diff --git a/sources b/sources index 3b84408..60fb4b9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e24e2f956fedfbcc58edfa40471b18d8 libcanberra-0.22.tar.gz +83fb2fb7608c77f91904e12a867534fd libcanberra-0.23.tar.gz From 3e53f2f7481373404a38f566df242c4dcdd06f85 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sat, 20 Feb 2010 17:48:18 +0000 Subject: [PATCH 03/78] New version 0.23 --- .cvsignore | 2 +- libcanberra.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 0cc410f..1dca496 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libcanberra-0.22.tar.gz +libcanberra-0.23.tar.gz diff --git a/libcanberra.spec b/libcanberra.spec index e80a3eb..979cc0e 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,5 +1,5 @@ Name: libcanberra -Version: 0.22 +Version: 0.23 Release: 1%{?dist} Summary: Portable Sound Event Library Group: System Environment/Libraries @@ -127,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Sat Feb 20 2010 Lennart Poettering 0.23-1 +- New version 0.23 + * Tue Oct 20 2009 Lennart Poettering 0.22-1 - New version 0.22 diff --git a/sources b/sources index 3b84408..60fb4b9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e24e2f956fedfbcc58edfa40471b18d8 libcanberra-0.22.tar.gz +83fb2fb7608c77f91904e12a867534fd libcanberra-0.23.tar.gz From 6d21ad9950f9cfd4069945ed7727529dbf75d006 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 17 May 2010 14:55:31 +0000 Subject: [PATCH 04/78] New version 0.24 --- .cvsignore | 2 +- libcanberra.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1dca496..9e794b5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libcanberra-0.23.tar.gz +libcanberra-0.24.tar.gz diff --git a/libcanberra.spec b/libcanberra.spec index 979cc0e..bd411a7 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,5 +1,5 @@ Name: libcanberra -Version: 0.23 +Version: 0.24 Release: 1%{?dist} Summary: Portable Sound Event Library Group: System Environment/Libraries @@ -127,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Mon May 17 2010 Lennart Poettering 0.24-1 +- New version 0.24 + * Sat Feb 20 2010 Lennart Poettering 0.23-1 - New version 0.23 diff --git a/sources b/sources index 60fb4b9..f8719c3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -83fb2fb7608c77f91904e12a867534fd libcanberra-0.23.tar.gz +23de3d11abd4920c6c9560e3a566e04d libcanberra-0.24.tar.gz From c5b44c91d2f1935ef655f633e423e0918cab1e65 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sun, 13 Jun 2010 18:00:50 +0000 Subject: [PATCH 05/78] New version 0.25; gtk3 support --- .cvsignore | 2 +- libcanberra.spec | 63 +++++++++++++++++++++++++++++++----------------- sources | 2 +- 3 files changed, 43 insertions(+), 24 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1dca496..eeab51b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libcanberra-0.23.tar.gz +libcanberra-0.25.tar.gz diff --git a/libcanberra.spec b/libcanberra.spec index 979cc0e..d51118d 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,5 +1,5 @@ Name: libcanberra -Version: 0.23 +Version: 0.25 Release: 1%{?dist} Summary: Portable Sound Event Library Group: System Environment/Libraries @@ -8,6 +8,7 @@ License: LGPLv2+ Url: http://git.0pointer.de/?p=libcanberra.git;a=summary BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel +BuildRequires: gtk3-devel BuildRequires: alsa-lib-devel BuildRequires: libvorbis-devel BuildRequires: libtool-ltdl-devel @@ -15,6 +16,7 @@ BuildRequires: gtk-doc BuildRequires: pulseaudio-libs-devel >= 0.9.15 BuildRequires: gstreamer-devel BuildRequires: libtdb-devel +BuildRequires: GConf2 BuildRequires: GConf2-devel BuildRequires: gettext-devel Requires: sound-theme-freedesktop @@ -25,15 +27,25 @@ A small and lightweight implementation of the XDG Sound Theme Specification (http://0pointer.de/public/sound-theme-spec.html). %package gtk2 -Summary: Gtk+ Bindings for libcanberra +Summary: Gtk+ 2.x Bindings for libcanberra +Group: System Environment/Libraries +Requires: %{name} = %{version}-%{release} +# GConf and other stuff is included in the gtk3 package, so always pull that in. +Requires: %{name}-gtk3 = %{version}-%{release} + +%description gtk2 +Gtk+ 2.x bindings for libcanberra + +%package gtk3 +Summary: Gtk+ 3.x Bindings for libcanberra Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} Requires(pre): GConf2 Requires(preun): GConf2 Requires(post): GConf2 -%description gtk2 -Gtk+ bindings for libcanberra +%description gtk3 +Gtk+ 3.x bindings for libcanberra %package devel Summary: Development Files for libcanberra Client Development @@ -49,26 +61,22 @@ Development Files for libcanberra Client Development %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%post gtk2 -/sbin/ldconfig -export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` -gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/libcanberra.schemas > /dev/null || : - +%pre gtk2 -p /sbin/ldconfig +%post gtk2 -p /sbin/ldconfig +%preun gtk2 -p /sbin/ldconfig %postun gtk2 -p /sbin/ldconfig -%pre gtk2 -if [ "$1" -gt 1 ]; then - export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` - gconftool-2 --makefile-install-rule \ - %{_sysconfdir}/gconf/schemas/libcanberra.schemas >& /dev/null || : -fi +%pre gtk3 +%gconf_schema_prepare libcanberra -%preun gtk2 -if [ "$1" -eq 0 ]; then - export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` - gconftool-2 --makefile-uninstall-rule \ - %{_sysconfdir}/gconf/schemas/libcanberra.schemas >& /dev/null || : -fi +%post gtk3 +/sbin/ldconfig +%gconf_schema_upgrade libcanberra + +%preun gtk3 +%gconf_schema_remove libcanberra + +%postun gtk3 -p /sbin/ldconfig %prep %setup -q @@ -79,6 +87,7 @@ make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT +export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make DESTDIR=$RPM_BUILD_ROOT install find $RPM_BUILD_ROOT \( -name *.a -o -name *.la \) -exec rm {} \; rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README @@ -101,6 +110,12 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %{_libdir}/libcanberra-gtk.so.* %{_libdir}/gtk-2.0/modules/libcanberra-gtk-module.so + +%files gtk3 +%defattr(-,root,root) +%{_libdir}/libcanberra-gtk3.so.* +%{_libdir}/gtk-3.0/modules/libcanberra-gtk3-module.so +%{_libdir}/gtk-3.0/modules/libcanberra-gtk-module.so %{_bindir}/canberra-gtk-play %{_datadir}/gnome/autostart/libcanberra-login-sound.desktop %{_datadir}/gnome/shutdown/libcanberra-logout-sound.sh @@ -117,8 +132,10 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/canberra-gtk.h %{_includedir}/canberra.h %{_libdir}/libcanberra-gtk.so +%{_libdir}/libcanberra-gtk3.so %{_libdir}/libcanberra.so %{_libdir}/pkgconfig/libcanberra-gtk.pc +%{_libdir}/pkgconfig/libcanberra-gtk3.pc %{_libdir}/pkgconfig/libcanberra.pc # co-own these directories to avoid requiring vala %dir %{_datadir}/vala @@ -127,6 +144,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Sun Jun 13 2010 Lennart Poettering 0.25-1 +- New version 0.25 + * Sat Feb 20 2010 Lennart Poettering 0.23-1 - New version 0.23 @@ -250,4 +270,3 @@ rm -rf $RPM_BUILD_ROOT * Fri Jun 13 2008 Lennart Poettering 0.3-1 - Initial package, based on Colin Guthrie's Mandriva package - diff --git a/sources b/sources index 60fb4b9..b6f9e91 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -83fb2fb7608c77f91904e12a867534fd libcanberra-0.23.tar.gz +f1462d0f4b81c36c3baf3f2029b2b4c7 libcanberra-0.25.tar.gz From 9d55773d445c0a1143868fde786e8ef4fece631d Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 29 Jun 2010 02:20:39 +0000 Subject: [PATCH 06/78] Rebuild --- libcanberra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libcanberra.spec b/libcanberra.spec index d51118d..784bf3c 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,6 +1,6 @@ Name: libcanberra Version: 0.25 -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.gz @@ -144,6 +144,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Mon Jun 28 2010 Matthias Clasen 0.25-2 +- Rebuild + * Sun Jun 13 2010 Lennart Poettering 0.25-1 - New version 0.25 From 3120c770284b069a6fe4eb2fd76dcdf6da35725e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 20:45:50 +0000 Subject: [PATCH 07/78] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 1 - 4 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 4ad9d15..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: libcanberra -# $Id$ -NAME := libcanberra -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index baa94ef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-13 diff --git a/import.log b/import.log deleted file mode 100644 index 7bf54a3..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -libcanberra-0_3-1_fc10:HEAD:libcanberra-0.3-1.fc10.src.rpm:1213637385 From 39697817f03a4eeb301d6ad6fa1de11daeb70261 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 20:45:56 +0000 Subject: [PATCH 08/78] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 4ad9d15..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: libcanberra -# $Id$ -NAME := libcanberra -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/import.log b/import.log deleted file mode 100644 index 7bf54a3..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -libcanberra-0_3-1_fc10:HEAD:libcanberra-0.3-1.fc10.src.rpm:1213637385 From d8ba70ef23b40721b138a02b791ba66befa5b221 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 23 Aug 2010 22:20:36 -0400 Subject: [PATCH 09/78] drop gtk-doc dep --- libcanberra.spec | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/libcanberra.spec b/libcanberra.spec index 784bf3c..c150d32 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,12 +1,11 @@ Name: libcanberra Version: 0.25 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Portable Sound Event Library Group: System Environment/Libraries Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz License: LGPLv2+ Url: http://git.0pointer.de/?p=libcanberra.git;a=summary -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel BuildRequires: gtk3-devel BuildRequires: alsa-lib-devel @@ -51,8 +50,6 @@ Gtk+ 3.x bindings for libcanberra Summary: Development Files for libcanberra Client Development Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: pkgconfig -Requires: gtk-doc Requires: gtk2-devel %description devel @@ -86,15 +83,11 @@ Development Files for libcanberra Client Development make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make DESTDIR=$RPM_BUILD_ROOT install find $RPM_BUILD_ROOT \( -name *.a -o -name *.la \) -exec rm {} \; rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README -%clean -rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root) %doc README LGPL @@ -128,7 +121,7 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-,root,root) -%doc %{_datadir}/gtk-doc/html/libcanberra +%doc %{_datadir}/gtk-doc %{_includedir}/canberra-gtk.h %{_includedir}/canberra.h %{_libdir}/libcanberra-gtk.so @@ -144,6 +137,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Mon Aug 23 2010 Matthias Clasen 0.25-3 +- Co-own /usr/share/gtk-doc (#604379) + * Mon Jun 28 2010 Matthias Clasen 0.25-2 - Rebuild From 22eb6276e85bc0c9f1c0b87aa60b961857c44c6d Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 4 Oct 2010 20:05:14 +0200 Subject: [PATCH 10/78] New version 0.26 --- .gitignore | 1 + libcanberra.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index eeab51b..3948198 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ libcanberra-0.25.tar.gz +libcanberra-0.26.tar.gz diff --git a/libcanberra.spec b/libcanberra.spec index c150d32..3ca4a4f 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,6 +1,6 @@ Name: libcanberra -Version: 0.25 -Release: 3%{?dist} +Version: 0.26 +Release: 1%{?dist} Summary: Portable Sound Event Library Group: System Environment/Libraries Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz @@ -137,6 +137,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Mon Oct 4 2010 Lennart Poettering 0.26-1 +- New version 0.26 + * Mon Aug 23 2010 Matthias Clasen 0.25-3 - Co-own /usr/share/gtk-doc (#604379) diff --git a/sources b/sources index b6f9e91..605bf00 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f1462d0f4b81c36c3baf3f2029b2b4c7 libcanberra-0.25.tar.gz +8ee84e24ce8877be1b54f102f462ca37 libcanberra-0.26.tar.gz From 1ab3e9097d79a9c8c180ddbe21c409470b58858d Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 4 Oct 2010 20:24:26 +0200 Subject: [PATCH 11/78] Use final 0.26 tarball --- libcanberra.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libcanberra.spec b/libcanberra.spec index 3ca4a4f..f92d0d0 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,6 +1,6 @@ Name: libcanberra Version: 0.26 -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.gz @@ -137,6 +137,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Mon Oct 4 2010 Lennart Poettering 0.26-2 +- Use final 0.26 tarball + * Mon Oct 4 2010 Lennart Poettering 0.26-1 - New version 0.26 diff --git a/sources b/sources index 605bf00..09d667c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8ee84e24ce8877be1b54f102f462ca37 libcanberra-0.26.tar.gz +ee2c66ada7c851a4e7b6eb1682285a24 libcanberra-0.26.tar.gz From 4560fc4f9343567c1598f6a06d18c91f6e00357f Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 1 Nov 2010 22:58:38 -0400 Subject: [PATCH 12/78] rebuild --- libcanberra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libcanberra.spec b/libcanberra.spec index f92d0d0..f400380 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,6 +1,6 @@ Name: libcanberra Version: 0.26 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Portable Sound Event Library Group: System Environment/Libraries Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz @@ -137,6 +137,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Mon Nov 1 2010 Matthias Clasen 0.26-3 +- Rebuild against newer gtk3 + * Mon Oct 4 2010 Lennart Poettering 0.26-2 - Use final 0.26 tarball From cb009124475e044f089512635f6518b789d4b0e7 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 3 Dec 2010 12:00:48 -0500 Subject: [PATCH 13/78] rebuild --- libcanberra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libcanberra.spec b/libcanberra.spec index f400380..e1194a7 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,6 +1,6 @@ Name: libcanberra Version: 0.26 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Portable Sound Event Library Group: System Environment/Libraries Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz @@ -137,6 +137,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Fri Dec 3 2010 Matthias Clasen 0.26-4 +- Rebuild against new gtk + * Mon Nov 1 2010 Matthias Clasen 0.26-3 - Rebuild against newer gtk3 From 17a18f95f4061200d35bc926ef6c997ec30f074a Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 7 Jan 2011 22:51:01 -0500 Subject: [PATCH 14/78] Rebuild --- libcanberra-quit-add.patch | 24 ++++++++++++++++++++++++ libcanberra.spec | 9 ++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 libcanberra-quit-add.patch diff --git a/libcanberra-quit-add.patch b/libcanberra-quit-add.patch new file mode 100644 index 0000000..0094569 --- /dev/null +++ b/libcanberra-quit-add.patch @@ -0,0 +1,24 @@ +diff -up libcanberra-0.26/src/canberra-gtk-module.c.quit-add libcanberra-0.26/src/canberra-gtk-module.c +--- libcanberra-0.26/src/canberra-gtk-module.c.quit-add 2011-01-07 22:48:49.388992626 -0500 ++++ libcanberra-0.26/src/canberra-gtk-module.c 2011-01-07 22:49:02.339995153 -0500 +@@ -932,11 +932,6 @@ static void connect_settings(void) { + connected = TRUE; + } + +-static gboolean quit_handler(gpointer data) { +- dispatch_queue(); +- return FALSE; +-} +- + G_MODULE_EXPORT void gtk_module_init(gint *argc, gchar ***argv[]) { + + /* This is the same quark libgnomeui uses! */ +@@ -963,8 +958,6 @@ G_MODULE_EXPORT void gtk_module_init(gin + install_hook(GTK_TYPE_WIDGET, "drag-drop", &signal_id_widget_drag_drop); + install_hook(GTK_TYPE_WIDGET, "drag-failed", &signal_id_widget_drag_failed); + install_hook(GTK_TYPE_EXPANDER, "activate", &signal_id_expander_activate); +- +- gtk_quit_add(1, quit_handler, NULL); + } + + G_MODULE_EXPORT gchar* g_module_check_init(GModule *module); diff --git a/libcanberra.spec b/libcanberra.spec index e1194a7..2251024 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,9 +1,12 @@ Name: libcanberra Version: 0.26 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Portable Sound Event Library Group: System Environment/Libraries Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz + +Patch0: libcanberra-quit-add.patch + License: LGPLv2+ Url: http://git.0pointer.de/?p=libcanberra.git;a=summary BuildRequires: gtk2-devel @@ -77,6 +80,7 @@ Development Files for libcanberra Client Development %prep %setup -q +%patch0 -p1 -b .quit-add %build %configure --disable-static --enable-pulse --enable-alsa --enable-null --enable-gstreamer --disable-oss --with-builtin=dso @@ -137,6 +141,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Fri Jan 7 2011 Matthias Clasen 0.26-5 +- Rebuild against newer gtk + * Fri Dec 3 2010 Matthias Clasen 0.26-4 - Rebuild against new gtk From a1d9b00590674f6050f591833912e727692b8670 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 2 Feb 2011 02:18:18 -0500 Subject: [PATCH 15/78] Rebuild --- libcanberra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libcanberra.spec b/libcanberra.spec index 2251024..0a864c6 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,6 +1,6 @@ Name: libcanberra Version: 0.26 -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.gz @@ -141,6 +141,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Wed Feb 2 2011 Matthias Clasen 0.26-6 +- Rebuild + * Fri Jan 7 2011 Matthias Clasen 0.26-5 - Rebuild against newer gtk From 97e74d3c62615d3eb21da322f7e5b19719f931ce Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 22:54:07 -0600 Subject: [PATCH 16/78] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- libcanberra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libcanberra.spec b/libcanberra.spec index 0a864c6..8042e8f 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,6 +1,6 @@ Name: libcanberra Version: 0.26 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Portable Sound Event Library Group: System Environment/Libraries Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz @@ -141,6 +141,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 0.26-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Wed Feb 2 2011 Matthias Clasen 0.26-6 - Rebuild From 6bcacf8140792cf2e4967232cca52f6513429867 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 10 Feb 2011 19:14:54 -0500 Subject: [PATCH 17/78] rebuild --- libcanberra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libcanberra.spec b/libcanberra.spec index 8042e8f..da67a77 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,6 +1,6 @@ Name: libcanberra Version: 0.26 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Portable Sound Event Library Group: System Environment/Libraries Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz @@ -141,6 +141,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Thu Feb 10 2011 Matthias Clasen 0.26-8 +- Rebuild against newer gtk + * Mon Feb 07 2011 Fedora Release Engineering - 0.26-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From faa8cf031cff9c6ac362e8b5010f84b07a658c3f Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 18 Feb 2011 01:43:18 +0100 Subject: [PATCH 18/78] New upstream release --- libcanberra.spec | 36 +++++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/libcanberra.spec b/libcanberra.spec index da67a77..5274433 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,12 +1,10 @@ Name: libcanberra -Version: 0.26 -Release: 8%{?dist} +Version: 0.27 +Release: 1%{?dist} Summary: Portable Sound Event Library Group: System Environment/Libraries Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz -Patch0: libcanberra-quit-add.patch - License: LGPLv2+ Url: http://git.0pointer.de/?p=libcanberra.git;a=summary BuildRequires: gtk2-devel @@ -21,8 +19,13 @@ BuildRequires: libtdb-devel BuildRequires: GConf2 BuildRequires: GConf2-devel BuildRequires: gettext-devel +BuildRequires: libudev-devel Requires: sound-theme-freedesktop Requires: pulseaudio-libs >= 0.9.15 +Requires: systemd-units +Requires(post): systemd-units +Requires(preun): systemd-units +Requires(postun): systemd-units %description A small and lightweight implementation of the XDG Sound Theme Specification @@ -58,8 +61,21 @@ Requires: gtk2-devel %description devel Development Files for libcanberra Client Development -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%post +/sbin/ldconfig +if [ $1 -eq 1 ]; then + /bin/systemctl daemon-reload >/dev/null 2>&1 || : +fi + +%preun +if [ $1 -eq 0 ]; then + /bin/systemctl --no-reload disable canberra-system-bootup.service canberra-system-shutdown.service canberra-system-shutdown-reboot.service >/dev/null 2>&1 || : + /bin/systemctl stop canberra-system-bootup.service canberra-system-shutdown.service canberra-system-shutdown-reboot.service >/dev/null 2>&1 || : +fi + +%postun +/sbin/ldconfig +/bin/systemctl daemon-reload >/dev/null 2>&1 || : %pre gtk2 -p /sbin/ldconfig %post gtk2 -p /sbin/ldconfig @@ -80,7 +96,6 @@ Development Files for libcanberra Client Development %prep %setup -q -%patch0 -p1 -b .quit-add %build %configure --disable-static --enable-pulse --enable-alsa --enable-null --enable-gstreamer --disable-oss --with-builtin=dso @@ -102,6 +117,10 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_libdir}/libcanberra-%{version}/libcanberra-null.so %{_libdir}/libcanberra-%{version}/libcanberra-multi.so %{_libdir}/libcanberra-%{version}/libcanberra-gstreamer.so +/lib/systemd/system/canberra-system-bootup.service +/lib/systemd/system/canberra-system-shutdown-reboot.service +/lib/systemd/system/canberra-system-shutdown.service +%{_bindir}/canberra-boot %files gtk2 %defattr(-,root,root) @@ -141,6 +160,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Fri Feb 18 2011 Lennart Poettering - 0.27-1 +- New upstream Release + * Thu Feb 10 2011 Matthias Clasen 0.26-8 - Rebuild against newer gtk From bbb4e725b67d48def4690dd925be3ce755b82ff3 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 18 Feb 2011 01:46:22 +0100 Subject: [PATCH 19/78] new tarball --- .gitignore | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3948198..4afe165 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,6 @@ -libcanberra-0.25.tar.gz -libcanberra-0.26.tar.gz +libcanberra-*.src.rpm +.build-*.log +/libcanberra-0.25.tar.gz +/libcanberra-0.26.tar.gz +/libcanberra-0.27.tar.gz +x86_64 diff --git a/sources b/sources index 09d667c..928eafb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ee2c66ada7c851a4e7b6eb1682285a24 libcanberra-0.26.tar.gz +1c683f8753074acf9bddf77e2577932d libcanberra-0.27.tar.gz From 03126541b29b1b7935e748cd41a83c79da496f26 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 25 Feb 2011 00:35:51 +0100 Subject: [PATCH 20/78] new upstream release --- .gitignore | 1 + libcanberra.spec | 31 ++++++++++++++++++------------- sources | 2 +- 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 4afe165..1faa9bc 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ libcanberra-*.src.rpm /libcanberra-0.26.tar.gz /libcanberra-0.27.tar.gz x86_64 +/libcanberra-0.28.tar.gz diff --git a/libcanberra.spec b/libcanberra.spec index 5274433..6eca3b2 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,5 +1,5 @@ Name: libcanberra -Version: 0.27 +Version: 0.28 Release: 1%{?dist} Summary: Portable Sound Event Library Group: System Environment/Libraries @@ -37,6 +37,9 @@ Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} # GConf and other stuff is included in the gtk3 package, so always pull that in. Requires: %{name}-gtk3 = %{version}-%{release} +Requires(pre): GConf2 +Requires(preun): GConf2 +Requires(post): GConf2 %description gtk2 Gtk+ 2.x bindings for libcanberra @@ -45,9 +48,7 @@ Gtk+ 2.x bindings for libcanberra Summary: Gtk+ 3.x Bindings for libcanberra Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} -Requires(pre): GConf2 -Requires(preun): GConf2 -Requires(post): GConf2 +Requires: gnome-settings-daemon %description gtk3 Gtk+ 3.x bindings for libcanberra @@ -77,21 +78,21 @@ fi /sbin/ldconfig /bin/systemctl daemon-reload >/dev/null 2>&1 || : -%pre gtk2 -p /sbin/ldconfig -%post gtk2 -p /sbin/ldconfig -%preun gtk2 -p /sbin/ldconfig -%postun gtk2 -p /sbin/ldconfig - -%pre gtk3 +%pre gtk2 %gconf_schema_prepare libcanberra -%post gtk3 +%post gtk2 /sbin/ldconfig %gconf_schema_upgrade libcanberra -%preun gtk3 +%preun gtk2 %gconf_schema_remove libcanberra +%postun gtk2 -p /sbin/ldconfig + +%pre gtk3 -p /sbin/ldconfig +%post gtk3 -p /sbin/ldconfig +%preun gtk3 -p /sbin/ldconfig %postun gtk3 -p /sbin/ldconfig %prep @@ -126,6 +127,7 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %defattr(-,root,root) %{_libdir}/libcanberra-gtk.so.* %{_libdir}/gtk-2.0/modules/libcanberra-gtk-module.so +%{_sysconfdir}/gconf/schemas/libcanberra.schemas %files gtk3 %defattr(-,root,root) @@ -140,7 +142,7 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %dir %{_datadir}/gdm/autostart/ %dir %{_datadir}/gdm/autostart/LoginWindow/ %{_datadir}/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop -%{_sysconfdir}/gconf/schemas/libcanberra.schemas +%{_libdir}/gnome-settings-daemon-3.0/gtk-modules/canberra-gtk-module.desktop %files devel %defattr(-,root,root) @@ -160,6 +162,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Fri Feb 25 2011 Lennart Poettering - 0.28-1 +- New upstream release + * Fri Feb 18 2011 Lennart Poettering - 0.27-1 - New upstream Release diff --git a/sources b/sources index 928eafb..c0f39f8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1c683f8753074acf9bddf77e2577932d libcanberra-0.27.tar.gz +c198b4811598c4c161ff505e4531b02c libcanberra-0.28.tar.gz From 0a90da42f65b2bd5546ab1ed78299d27b6433f03 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 1 Mar 2011 13:42:52 -0500 Subject: [PATCH 21/78] Own the directory so we don't have to require gnome-settings-daemon. --- libcanberra.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libcanberra.spec b/libcanberra.spec index 6eca3b2..188ce95 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,6 +1,6 @@ Name: libcanberra Version: 0.28 -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.gz @@ -48,7 +48,6 @@ Gtk+ 2.x bindings for libcanberra Summary: Gtk+ 3.x Bindings for libcanberra Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} -Requires: gnome-settings-daemon %description gtk3 Gtk+ 3.x bindings for libcanberra @@ -142,6 +141,7 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %dir %{_datadir}/gdm/autostart/ %dir %{_datadir}/gdm/autostart/LoginWindow/ %{_datadir}/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop +%dir %{_libdir}/gnome-settings-daemon-3.0/gtk-modules %{_libdir}/gnome-settings-daemon-3.0/gtk-modules/canberra-gtk-module.desktop %files devel @@ -162,6 +162,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Tue Mar 1 2011 Bill Nottingham - 0.28-2 +- own gnome-settings-daemon desktop dir, don't require g-s-d + * Fri Feb 25 2011 Lennart Poettering - 0.28-1 - New upstream release From 94c9190e02f062bef531afcad9c9284f9b4861b8 Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Thu, 24 Mar 2011 21:20:23 -0700 Subject: [PATCH 22/78] Workaround a hang Others were seeing this bug today (dcbw, mccann), so committing this for now until a better fix can be made upstream. https://bugs.freedesktop.org/show_bug.cgi?id=35024 --- ...-a-hang-if-there-are-server-problems.patch | 28 +++++++++++++++++++ libcanberra.spec | 7 ++++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 0001-Workaround-a-hang-if-there-are-server-problems.patch diff --git a/0001-Workaround-a-hang-if-there-are-server-problems.patch b/0001-Workaround-a-hang-if-there-are-server-problems.patch new file mode 100644 index 0000000..bc84ce3 --- /dev/null +++ b/0001-Workaround-a-hang-if-there-are-server-problems.patch @@ -0,0 +1,28 @@ +From 151ddf4a0d6f4db39ccabf78b083a4343623bbc7 Mon Sep 17 00:00:00 2001 +From: Christopher Aillon +Date: Sat, 5 Mar 2011 11:03:31 -0800 +Subject: [PATCH] Workaround a hang if there are server problems + +https://bugs.freedesktop.org/show_bug.cgi?id=35024 +--- + src/pulse.c | 4 ---- + 1 files changed, 0 insertions(+), 4 deletions(-) + +diff --git a/src/pulse.c b/src/pulse.c +index d4225d1..8b4188b 100644 +--- a/src/pulse.c ++++ b/src/pulse.c +@@ -312,10 +312,6 @@ static void context_state_cb(pa_context *pc, void *userdata) { + } + + p->subscribed = FALSE; +- +- /* If we managed to connect once, then let's try to +- * reconnect, and pass NOFAIL */ +- context_connect(c, TRUE); + } + } + +-- +1.7.4.1 + diff --git a/libcanberra.spec b/libcanberra.spec index 188ce95..7b7880d 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,9 +1,10 @@ Name: libcanberra Version: 0.28 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Portable Sound Event Library Group: System Environment/Libraries Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz +Patch0: 0001-Workaround-a-hang-if-there-are-server-problems.patch License: LGPLv2+ Url: http://git.0pointer.de/?p=libcanberra.git;a=summary @@ -96,6 +97,7 @@ fi %prep %setup -q +%patch0 -p1 -b .caillon %build %configure --disable-static --enable-pulse --enable-alsa --enable-null --enable-gstreamer --disable-oss --with-builtin=dso @@ -162,6 +164,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Thu Mar 24 2011 Christopher Aillon - 0.28-3 +- Workaround a hang (fdo#35024) + * Tue Mar 1 2011 Bill Nottingham - 0.28-2 - own gnome-settings-daemon desktop dir, don't require g-s-d From ba0923ea8f5823d85a63aa46057067f63ca3a747 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 8 Nov 2011 23:54:50 -0500 Subject: [PATCH 23/78] Rebuild to break bogus libpng dep --- libcanberra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libcanberra.spec b/libcanberra.spec index 7b7880d..d379b4d 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,6 +1,6 @@ Name: libcanberra Version: 0.28 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Portable Sound Event Library Group: System Environment/Libraries Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz @@ -164,6 +164,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Tue Nov 08 2011 Adam Jackson - 0.28-4 +- Rebuild to break bogus libpng dep + * Thu Mar 24 2011 Christopher Aillon - 0.28-3 - Workaround a hang (fdo#35024) From cca8495101c367c72aeaa1579db84f02e986c037 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 13 Jan 2012 01:26:27 -0600 Subject: [PATCH 24/78] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- libcanberra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libcanberra.spec b/libcanberra.spec index d379b4d..529bc87 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,6 +1,6 @@ Name: libcanberra Version: 0.28 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Portable Sound Event Library Group: System Environment/Libraries Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz @@ -164,6 +164,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Fri Jan 13 2012 Fedora Release Engineering - 0.28-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Tue Nov 08 2011 Adam Jackson - 0.28-4 - Rebuild to break bogus libpng dep From ca764ffc823468f349c7f6f56e1b0ece035ea2be Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Thu, 23 Feb 2012 23:52:58 +0000 Subject: [PATCH 25/78] Update systemd service file locations --- libcanberra.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/libcanberra.spec b/libcanberra.spec index 529bc87..3c504e3 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,6 +1,6 @@ Name: libcanberra Version: 0.28 -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.gz @@ -119,9 +119,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_libdir}/libcanberra-%{version}/libcanberra-null.so %{_libdir}/libcanberra-%{version}/libcanberra-multi.so %{_libdir}/libcanberra-%{version}/libcanberra-gstreamer.so -/lib/systemd/system/canberra-system-bootup.service -/lib/systemd/system/canberra-system-shutdown-reboot.service -/lib/systemd/system/canberra-system-shutdown.service +/usr/lib/systemd/system/canberra-system-bootup.service +/usr/lib/systemd/system/canberra-system-shutdown-reboot.service +/usr/lib/systemd/system/canberra-system-shutdown.service %{_bindir}/canberra-boot %files gtk2 @@ -164,6 +164,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Thu Feb 23 2012 Peter Robinson - 0.28-6 +- Update systemd service file locations + * Fri Jan 13 2012 Fedora Release Engineering - 0.28-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From c08c2910083ed3c4c0db818cd324bf478af1a332 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 15 May 2012 12:42:06 +0200 Subject: [PATCH 26/78] new upstream --- .gitignore | 8 +-- ...-a-hang-if-there-are-server-problems.patch | 28 ----------- libcanberra.spec | 50 +++++++------------ sources | 2 +- 4 files changed, 24 insertions(+), 64 deletions(-) delete mode 100644 0001-Workaround-a-hang-if-there-are-server-problems.patch diff --git a/.gitignore b/.gitignore index 1faa9bc..f45f91f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,9 @@ -libcanberra-*.src.rpm -.build-*.log +/libcanberra-*.src.rpm +/.build-*.log /libcanberra-0.25.tar.gz /libcanberra-0.26.tar.gz /libcanberra-0.27.tar.gz -x86_64 +/x86_64 /libcanberra-0.28.tar.gz +/libcanberra-0.*/ +/libcanberra-0.29.tar.xz diff --git a/0001-Workaround-a-hang-if-there-are-server-problems.patch b/0001-Workaround-a-hang-if-there-are-server-problems.patch deleted file mode 100644 index bc84ce3..0000000 --- a/0001-Workaround-a-hang-if-there-are-server-problems.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 151ddf4a0d6f4db39ccabf78b083a4343623bbc7 Mon Sep 17 00:00:00 2001 -From: Christopher Aillon -Date: Sat, 5 Mar 2011 11:03:31 -0800 -Subject: [PATCH] Workaround a hang if there are server problems - -https://bugs.freedesktop.org/show_bug.cgi?id=35024 ---- - src/pulse.c | 4 ---- - 1 files changed, 0 insertions(+), 4 deletions(-) - -diff --git a/src/pulse.c b/src/pulse.c -index d4225d1..8b4188b 100644 ---- a/src/pulse.c -+++ b/src/pulse.c -@@ -312,10 +312,6 @@ static void context_state_cb(pa_context *pc, void *userdata) { - } - - p->subscribed = FALSE; -- -- /* If we managed to connect once, then let's try to -- * reconnect, and pass NOFAIL */ -- context_connect(c, TRUE); - } - } - --- -1.7.4.1 - diff --git a/libcanberra.spec b/libcanberra.spec index 3c504e3..eb03aa6 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,10 +1,9 @@ Name: libcanberra -Version: 0.28 -Release: 6%{?dist} +Version: 0.29 +Release: 1%{?dist} Summary: Portable Sound Event Library Group: System Environment/Libraries -Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz -Patch0: 0001-Workaround-a-hang-if-there-are-server-problems.patch +Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz License: LGPLv2+ Url: http://git.0pointer.de/?p=libcanberra.git;a=summary @@ -17,16 +16,14 @@ BuildRequires: gtk-doc BuildRequires: pulseaudio-libs-devel >= 0.9.15 BuildRequires: gstreamer-devel BuildRequires: libtdb-devel -BuildRequires: GConf2 -BuildRequires: GConf2-devel BuildRequires: gettext-devel BuildRequires: libudev-devel Requires: sound-theme-freedesktop Requires: pulseaudio-libs >= 0.9.15 Requires: systemd-units -Requires(post): systemd-units -Requires(preun): systemd-units -Requires(postun): systemd-units +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd %description A small and lightweight implementation of the XDG Sound Theme Specification @@ -36,11 +33,8 @@ A small and lightweight implementation of the XDG Sound Theme Specification Summary: Gtk+ 2.x Bindings for libcanberra Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} -# GConf and other stuff is included in the gtk3 package, so always pull that in. +# Some other stuff is included in the gtk3 package, so always pull that in. Requires: %{name}-gtk3 = %{version}-%{release} -Requires(pre): GConf2 -Requires(preun): GConf2 -Requires(post): GConf2 %description gtk2 Gtk+ 2.x bindings for libcanberra @@ -78,33 +72,20 @@ fi /sbin/ldconfig /bin/systemctl daemon-reload >/dev/null 2>&1 || : -%pre gtk2 -%gconf_schema_prepare libcanberra - -%post gtk2 -/sbin/ldconfig -%gconf_schema_upgrade libcanberra - -%preun gtk2 -%gconf_schema_remove libcanberra - +%post gtk2 -p /sbin/ldconfig %postun gtk2 -p /sbin/ldconfig -%pre gtk3 -p /sbin/ldconfig %post gtk3 -p /sbin/ldconfig -%preun gtk3 -p /sbin/ldconfig %postun gtk3 -p /sbin/ldconfig %prep %setup -q -%patch0 -p1 -b .caillon %build %configure --disable-static --enable-pulse --enable-alsa --enable-null --enable-gstreamer --disable-oss --with-builtin=dso make %{?_smp_mflags} %install -export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make DESTDIR=$RPM_BUILD_ROOT install find $RPM_BUILD_ROOT \( -name *.a -o -name *.la \) -exec rm {} \; rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README @@ -119,16 +100,15 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_libdir}/libcanberra-%{version}/libcanberra-null.so %{_libdir}/libcanberra-%{version}/libcanberra-multi.so %{_libdir}/libcanberra-%{version}/libcanberra-gstreamer.so -/usr/lib/systemd/system/canberra-system-bootup.service -/usr/lib/systemd/system/canberra-system-shutdown-reboot.service -/usr/lib/systemd/system/canberra-system-shutdown.service +%{_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 %{_bindir}/canberra-boot %files gtk2 %defattr(-,root,root) %{_libdir}/libcanberra-gtk.so.* %{_libdir}/gtk-2.0/modules/libcanberra-gtk-module.so -%{_sysconfdir}/gconf/schemas/libcanberra.schemas %files gtk3 %defattr(-,root,root) @@ -143,7 +123,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %dir %{_datadir}/gdm/autostart/ %dir %{_datadir}/gdm/autostart/LoginWindow/ %{_datadir}/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop -%dir %{_libdir}/gnome-settings-daemon-3.0/gtk-modules +# co-own these directories to avoid requiring g-s-d +%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 devel @@ -164,6 +146,10 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Tue May 15 2012 Lennart Poettering - 0.29-1 +- New upstream +- Closes #744888, #696194 + * Thu Feb 23 2012 Peter Robinson - 0.28-6 - Update systemd service file locations diff --git a/sources b/sources index c0f39f8..25ecf0b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c198b4811598c4c161ff505e4531b02c libcanberra-0.28.tar.gz +2594093a5d61047bd9cc87e955f86df8 libcanberra-0.29.tar.xz From ef40eeae561e64e2e31d1954b97a7dd9bbeff7bd Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 15 May 2012 15:46:12 +0200 Subject: [PATCH 27/78] Various minor .spec file fixes --- libcanberra.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libcanberra.spec b/libcanberra.spec index eb03aa6..97f40cd 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,6 +1,6 @@ Name: libcanberra Version: 0.29 -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 @@ -20,7 +20,6 @@ BuildRequires: gettext-devel BuildRequires: libudev-devel Requires: sound-theme-freedesktop Requires: pulseaudio-libs >= 0.9.15 -Requires: systemd-units Requires(post): systemd Requires(preun): systemd Requires(postun): systemd @@ -82,7 +81,7 @@ fi %setup -q %build -%configure --disable-static --enable-pulse --enable-alsa --enable-null --enable-gstreamer --disable-oss --with-builtin=dso +%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 @@ -146,6 +145,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Tue May 15 2012 Lennart Poettering - 0.29-2 +- Various minor .spec file fixes + * Tue May 15 2012 Lennart Poettering - 0.29-1 - New upstream - Closes #744888, #696194 From 8a7916806d3d2b62d7867af44f50a6befb0560de Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Tue, 5 Jun 2012 00:45:03 +0200 Subject: [PATCH 28/78] rebuild for libudev1 --- libcanberra.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libcanberra.spec b/libcanberra.spec index 97f40cd..aae241e 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,6 +1,6 @@ Name: libcanberra Version: 0.29 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Portable Sound Event Library Group: System Environment/Libraries Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz @@ -17,7 +17,7 @@ BuildRequires: pulseaudio-libs-devel >= 0.9.15 BuildRequires: gstreamer-devel BuildRequires: libtdb-devel BuildRequires: gettext-devel -BuildRequires: libudev-devel +BuildRequires: systemd-devel Requires: sound-theme-freedesktop Requires: pulseaudio-libs >= 0.9.15 Requires(post): systemd @@ -145,6 +145,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Mon Jun 04 2012 Kay Sievers - 0.29-3 +- rebuild for libudev1 + * Tue May 15 2012 Lennart Poettering - 0.29-2 - Various minor .spec file fixes From aa8f23e5bceab8ca1f04ac0f785a0df321ffdc6c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 19 Jul 2012 14:22:10 -0500 Subject: [PATCH 29/78] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- libcanberra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libcanberra.spec b/libcanberra.spec index aae241e..c653b50 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,6 +1,6 @@ Name: libcanberra Version: 0.29 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Portable Sound Event Library Group: System Environment/Libraries Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz @@ -145,6 +145,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Thu Jul 19 2012 Fedora Release Engineering - 0.29-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Mon Jun 04 2012 Kay Sievers - 0.29-3 - rebuild for libudev1 From 12c04506c0e0f94dc437d902571c4effd66390d8 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 14 Sep 2012 18:03:14 +0200 Subject: [PATCH 30/78] Use systemd macros --- libcanberra.spec | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/libcanberra.spec b/libcanberra.spec index c653b50..d69c26d 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,6 +1,6 @@ Name: libcanberra Version: 0.29 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Portable Sound Event Library Group: System Environment/Libraries Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz @@ -57,19 +57,14 @@ Development Files for libcanberra Client Development %post /sbin/ldconfig -if [ $1 -eq 1 ]; then - /bin/systemctl daemon-reload >/dev/null 2>&1 || : -fi +%systemd_post canberra-system-bootup.service canberra-system-shutdown.service canberra-system-shutdown-reboot.service %preun -if [ $1 -eq 0 ]; then - /bin/systemctl --no-reload disable canberra-system-bootup.service canberra-system-shutdown.service canberra-system-shutdown-reboot.service >/dev/null 2>&1 || : - /bin/systemctl stop canberra-system-bootup.service canberra-system-shutdown.service canberra-system-shutdown-reboot.service >/dev/null 2>&1 || : -fi +%systemd_preun canberra-system-bootup.service canberra-system-shutdown.service canberra-system-shutdown-reboot.service %postun /sbin/ldconfig -/bin/systemctl daemon-reload >/dev/null 2>&1 || : +%systemd_postun %post gtk2 -p /sbin/ldconfig %postun gtk2 -p /sbin/ldconfig @@ -145,6 +140,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Fri Sep 14 2012 Lennart Poettering - 0.29-5 +- Use systemd macros + * Thu Jul 19 2012 Fedora Release Engineering - 0.29-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From a85292670a00d69157dce574d86a20beb24cf18f Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Mon, 24 Sep 2012 17:52:24 +0200 Subject: [PATCH 31/78] 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 2194d9210c716a1ce98a3b75a1867350c5ef6aae Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Mon, 24 Sep 2012 17:52:24 +0200 Subject: [PATCH 32/78] 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 33/78] 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 a9d23b5bfee4c2f6603e5ac646f1a988e41aa8ba Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 29 Oct 2012 22:37:52 -0400 Subject: [PATCH 34/78] 0.30 --- .gitignore | 1 + libcanberra.spec | 16 ++++++++++------ sources | 2 +- 3 files changed, 12 insertions(+), 7 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..991d6cb 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 @@ -30,9 +30,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 @@ -40,7 +40,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 @@ -48,7 +48,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 @@ -138,6 +138,10 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Mon Oct 29 2012 Matthias Clasen - 0.30-1 +- Update to 0.30 +- Add %%{_isa} as required to fix multilib issues + * 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 35/78] 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 From 3e30dd5142ad6309ce48cd4405b321eca7b01097 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 30 Dec 2012 20:44:15 +0000 Subject: [PATCH 36/78] fix dates and build --- libcanberra.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libcanberra.spec b/libcanberra.spec index 114d0ca..f388f30 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -93,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 @@ -243,7 +244,7 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README * Wed Sep 16 2009 Kevin Kofler 0.17-2 - Don't require gdm in -gtk2 (#522998) -* Fri Sep 12 2009 Lennart Poettering 0.17-1 +* Fri Sep 11 2009 Lennart Poettering 0.17-1 - New version 0.17 * Thu Aug 27 2009 Lennart Poettering 0.16-1 @@ -300,7 +301,7 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README * Mon Oct 6 2008 Lennart Poettering 0.10-1 - New version -* Thu Sep 9 2008 Lennart Poettering 0.9-1 +* Tue Sep 9 2008 Lennart Poettering 0.9-1 - New version * Thu Aug 28 2008 Lennart Poettering 0.8-2 From c2936c1ef78ae50e826d43a7b035cccb113dc453 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 22:05:57 -0600 Subject: [PATCH 37/78] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- libcanberra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libcanberra.spec b/libcanberra.spec index f388f30..2044da3 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,6 +1,6 @@ Name: libcanberra Version: 0.30 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Portable Sound Event Library Group: System Environment/Libraries Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz @@ -140,6 +140,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Thu Feb 14 2013 Fedora Release Engineering - 0.30-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Mon Oct 29 2012 Matthias Clasen - 0.30-2 - Update to 0.30 - Add %%{_isa} as required to fix multilib issues From be368f6cf7d631c7cfcfe1fc53ab602dcd61cd6f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 2 Aug 2013 23:57:18 -0500 Subject: [PATCH 38/78] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- libcanberra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libcanberra.spec b/libcanberra.spec index 2044da3..d9fd67b 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,6 +1,6 @@ Name: libcanberra Version: 0.30 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Portable Sound Event Library Group: System Environment/Libraries Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz @@ -140,6 +140,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 0.30-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Thu Feb 14 2013 Fedora Release Engineering - 0.30-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 7f631fb1a4afbacc98d8e412c3b06ef02516f274 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 19 May 2014 09:56:32 -0400 Subject: [PATCH 39/78] Drop hardcoded X11 assumption --- ...-all-GdkDisplays-are-GdkX11Displays-.patch | 70 +++++++++++++++++++ libcanberra.spec | 8 ++- 2 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch diff --git a/0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch b/0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch new file mode 100644 index 0000000..6187900 --- /dev/null +++ b/0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch @@ -0,0 +1,70 @@ +From c0620e432650e81062c1967cc669829dbd29b310 Mon Sep 17 00:00:00 2001 +From: Michael Meeks +Date: Fri, 9 Nov 2012 16:16:40 +0000 +Subject: [PATCH] gtk: Don't assume all GdkDisplays are GdkX11Displays: + broadway/wayland + +--- + src/canberra-gtk-module.c | 15 +++++++++++++++ + src/canberra-gtk.c | 5 +++++ + 2 files changed, 20 insertions(+) + +diff --git a/src/canberra-gtk-module.c b/src/canberra-gtk-module.c +index 67791f0..c1532ab 100644 +--- a/src/canberra-gtk-module.c ++++ b/src/canberra-gtk-module.c +@@ -307,6 +307,11 @@ static gint window_get_desktop(GdkDisplay *d, GdkWindow *w) { + guchar *data = NULL; + gint ret = -1; + ++#ifdef GDK_IS_X11_DISPLAY ++ if (!GDK_IS_X11_DISPLAY(d)) ++ return 0; ++#endif ++ + if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), GDK_WINDOW_XID(w), + gdk_x11_get_xatom_by_name_for_display(d, "_NET_WM_DESKTOP"), + 0, G_MAXLONG, False, XA_CARDINAL, &type_return, +@@ -335,6 +340,11 @@ static gint display_get_desktop(GdkDisplay *d) { + guchar *data = NULL; + gint ret = -1; + ++#ifdef GDK_IS_X11_DISPLAY ++ if (!GDK_IS_X11_DISPLAY(d)) ++ return 0; ++#endif ++ + if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), DefaultRootWindow(GDK_DISPLAY_XDISPLAY(d)), + gdk_x11_get_xatom_by_name_for_display(d, "_NET_CURRENT_DESKTOP"), + 0, G_MAXLONG, False, XA_CARDINAL, &type_return, +@@ -365,6 +375,11 @@ static gboolean window_is_xembed(GdkDisplay *d, GdkWindow *w) { + gboolean ret = FALSE; + Atom xembed; + ++#ifdef GDK_IS_X11_DISPLAY ++ if (!GDK_IS_X11_DISPLAY(d)) ++ return FALSE; ++#endif ++ + /* Gnome Panel applets are XEMBED windows. We need to make sure we + * ignore them */ + +diff --git a/src/canberra-gtk.c b/src/canberra-gtk.c +index 34446f5..08cb668 100644 +--- a/src/canberra-gtk.c ++++ b/src/canberra-gtk.c +@@ -185,6 +185,11 @@ static gint window_get_desktop(GdkDisplay *d, GdkWindow *w) { + guchar *data = NULL; + gint ret = -1; + ++#ifdef GDK_IS_X11_DISPLAY ++ if (!GDK_IS_X11_DISPLAY(d)) ++ return 0; ++#endif ++ + if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), GDK_WINDOW_XID(w), + gdk_x11_get_xatom_by_name_for_display(d, "_NET_WM_DESKTOP"), + 0, G_MAXLONG, False, XA_CARDINAL, &type_return, +-- +1.9.0 + diff --git a/libcanberra.spec b/libcanberra.spec index d9fd67b..d9da7f5 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,10 +1,12 @@ Name: libcanberra Version: 0.30 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Portable Sound Event Library Group: System Environment/Libraries Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz +Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch + License: LGPLv2+ Url: http://git.0pointer.de/?p=libcanberra.git;a=summary BuildRequires: gtk2-devel @@ -74,6 +76,7 @@ Development Files for libcanberra Client Development %prep %setup -q +%patch0 -p1 %build %configure --disable-static --enable-pulse --enable-alsa --enable-null --disable-oss --with-builtin=dso --with-systemdsystemunitdir=/usr/lib/systemd/system @@ -140,6 +143,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Mon May 19 2014 Matthias Clasen - 0.30-5 +- Add an upstream patch to drop hardcoded X11 assumptions + * Sat Aug 03 2013 Fedora Release Engineering - 0.30-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 54c2f825575733129c1d71108386c9264a4d5ef7 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 6 Jun 2014 21:45:52 -0500 Subject: [PATCH 40/78] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- libcanberra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libcanberra.spec b/libcanberra.spec index d9da7f5..8002bc1 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,6 +1,6 @@ Name: libcanberra Version: 0.30 -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 @@ -143,6 +143,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 0.30-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Mon May 19 2014 Matthias Clasen - 0.30-5 - Add an upstream patch to drop hardcoded X11 assumptions From a4e994d6031b5ae7512f79ae5e5399c975c0ba05 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 17 Aug 2014 02:28:58 +0000 Subject: [PATCH 41/78] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- libcanberra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libcanberra.spec b/libcanberra.spec index 8002bc1..4ed4641 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,6 +1,6 @@ Name: libcanberra Version: 0.30 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Portable Sound Event Library Group: System Environment/Libraries Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz @@ -143,6 +143,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Sun Aug 17 2014 Fedora Release Engineering - 0.30-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 0.30-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 70b0fbd253acdcc6d3ba774e76086268ad8c610e Mon Sep 17 00:00:00 2001 From: Till Maas Date: Sat, 21 Feb 2015 22:26:59 +0100 Subject: [PATCH 42/78] Rebuilt for Fedora 23 Change https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code --- libcanberra.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libcanberra.spec b/libcanberra.spec index 4ed4641..eb869f3 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,6 +1,6 @@ Name: libcanberra Version: 0.30 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Portable Sound Event Library Group: System Environment/Libraries Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz @@ -143,6 +143,10 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Sat Feb 21 2015 Till Maas - 0.30-8 +- Rebuilt for Fedora 23 Change + https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code + * Sun Aug 17 2014 Fedora Release Engineering - 0.30-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From ea8ea34cfc96ad7f735231db26ea9ab31455743a Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sat, 28 Feb 2015 20:05:03 -0700 Subject: [PATCH 43/78] Try and fix devel package not pulling in the right things in rawhide --- libcanberra.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libcanberra.spec b/libcanberra.spec index eb869f3..f6078e2 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,6 +1,6 @@ Name: libcanberra Version: 0.30 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Portable Sound Event Library Group: System Environment/Libraries Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz @@ -52,6 +52,8 @@ Gtk+ 3.x bindings for libcanberra Summary: Development Files for libcanberra Client Development Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}-gtk2%{?_isa} = %{version}-%{release} +Requires: %{name}-gtk3%{?_isa} = %{version}-%{release} Requires: gtk2-devel %description devel @@ -143,6 +145,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Sat Feb 28 2015 Kevin Fenzi 0.30-9 +- Try and fix devel package not pulling in the right things in rawhide + * Sat Feb 21 2015 Till Maas - 0.30-8 - Rebuilt for Fedora 23 Change https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code From c034f9da4832a465ea314fa9aa9972e5fc4638c8 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 14:59:30 +0000 Subject: [PATCH 44/78] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- libcanberra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libcanberra.spec b/libcanberra.spec index f6078e2..537b6ac 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,6 +1,6 @@ Name: libcanberra Version: 0.30 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Portable Sound Event Library Group: System Environment/Libraries Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz @@ -145,6 +145,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 0.30-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat Feb 28 2015 Kevin Fenzi 0.30-9 - Try and fix devel package not pulling in the right things in rawhide From 11e699d60c722d0e94f1600a8c2e18ba996cd04c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 4 Feb 2016 02:57:16 +0000 Subject: [PATCH 45/78] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- libcanberra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libcanberra.spec b/libcanberra.spec index 537b6ac..dc0c228 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,6 +1,6 @@ Name: libcanberra Version: 0.30 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Portable Sound Event Library Group: System Environment/Libraries Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz @@ -145,6 +145,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 0.30-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Wed Jun 17 2015 Fedora Release Engineering - 0.30-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 0bc580215ced5aa60e58051c42188b5cd9c842c1 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 2 Dec 2016 07:38:06 -0700 Subject: [PATCH 46/78] Rebuild for libtdb 1.3.12 - Drop %defattr - Use %license --- libcanberra.spec | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/libcanberra.spec b/libcanberra.spec index dc0c228..7f8f256 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,6 +1,6 @@ Name: libcanberra Version: 0.30 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Portable Sound Event Library Group: System Environment/Libraries Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz @@ -90,7 +90,7 @@ find $RPM_BUILD_ROOT \( -name *.a -o -name *.la \) -exec rm {} \; rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %files -%defattr(-,root,root) +%license LGPL %doc README LGPL %{_libdir}/libcanberra.so.* %dir %{_libdir}/libcanberra-%{version} @@ -105,12 +105,10 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_bindir}/canberra-boot %files gtk2 -%defattr(-,root,root) %{_libdir}/libcanberra-gtk.so.* %{_libdir}/gtk-2.0/modules/libcanberra-gtk-module.so %files gtk3 -%defattr(-,root,root) %{_libdir}/libcanberra-gtk3.so.* %{_libdir}/gtk-3.0/modules/libcanberra-gtk3-module.so %{_libdir}/gtk-3.0/modules/libcanberra-gtk-module.so @@ -128,7 +126,6 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_libdir}/gnome-settings-daemon-3.0/gtk-modules/canberra-gtk-module.desktop %files devel -%defattr(-,root,root) %doc %{_datadir}/gtk-doc %{_includedir}/canberra-gtk.h %{_includedir}/canberra.h @@ -145,6 +142,11 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Fri Dec 02 2016 Orion Poplawski - 0.30-12 +- Rebuild for libtdb 1.3.12 +- Drop %%defattr +- Use %%license + * Thu Feb 04 2016 Fedora Release Engineering - 0.30-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 75c2540c09e8c27ba6fead173d5091f47dd5dde5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 18:26:09 +0000 Subject: [PATCH 47/78] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- libcanberra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libcanberra.spec b/libcanberra.spec index 7f8f256..1b02523 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,6 +1,6 @@ Name: libcanberra Version: 0.30 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Portable Sound Event Library Group: System Environment/Libraries Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz @@ -142,6 +142,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 0.30-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Fri Dec 02 2016 Orion Poplawski - 0.30-12 - Rebuild for libtdb 1.3.12 - Drop %%defattr From fd9c097bd200cd894887c852e7b4b55c886f75e4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 18:35:50 +0000 Subject: [PATCH 48/78] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- libcanberra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libcanberra.spec b/libcanberra.spec index 1b02523..5205f25 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,6 +1,6 @@ Name: libcanberra Version: 0.30 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Portable Sound Event Library Group: System Environment/Libraries Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz @@ -142,6 +142,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 0.30-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 0.30-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 697979f388e4d8ac63235c771b4a3f33f326d56a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 01:14:32 +0000 Subject: [PATCH 49/78] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- libcanberra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libcanberra.spec b/libcanberra.spec index 5205f25..784e659 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,6 +1,6 @@ Name: libcanberra Version: 0.30 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Portable Sound Event Library Group: System Environment/Libraries Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz @@ -142,6 +142,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 0.30-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 0.30-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From bcaac7d852147d6e66ec1c6ba8a334f934b9dc92 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 21:17:36 +0000 Subject: [PATCH 50/78] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libcanberra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libcanberra.spec b/libcanberra.spec index 784e659..a14f822 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,6 +1,6 @@ Name: libcanberra Version: 0.30 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Portable Sound Event Library Group: System Environment/Libraries Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz @@ -142,6 +142,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 0.30-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Aug 03 2017 Fedora Release Engineering - 0.30-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From b969e213d61b4a3872ab4edaa93f0f818f5b7cdc Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 9 Jul 2018 19:06:47 +0200 Subject: [PATCH 51/78] add BuildRequires: gcc Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- libcanberra.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/libcanberra.spec b/libcanberra.spec index a14f822..e2a0c8b 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -9,6 +9,7 @@ Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch License: LGPLv2+ Url: http://git.0pointer.de/?p=libcanberra.git;a=summary +BuildRequires: gcc BuildRequires: gtk2-devel BuildRequires: gtk3-devel BuildRequires: alsa-lib-devel From bc55346b82d5ebaf53bed3647785d21a085408d8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 07:52:33 +0000 Subject: [PATCH 52/78] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libcanberra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libcanberra.spec b/libcanberra.spec index e2a0c8b..ca55d41 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,6 +1,6 @@ Name: libcanberra Version: 0.30 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Portable Sound Event Library Group: System Environment/Libraries Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz @@ -143,6 +143,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 0.30-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 0.30-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 91f8686f05f7fd7fae5d07dd9c078291ff7a00ec Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 22 Jan 2019 18:39:34 +0100 Subject: [PATCH 53/78] Remove obsolete ldconfig scriptlets References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets Signed-off-by: Igor Gnatenko --- libcanberra.spec | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libcanberra.spec b/libcanberra.spec index ca55d41..50b0f76 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -61,21 +61,19 @@ Requires: gtk2-devel Development Files for libcanberra Client Development %post -/sbin/ldconfig +%{?ldconfig} %systemd_post canberra-system-bootup.service canberra-system-shutdown.service canberra-system-shutdown-reboot.service %preun %systemd_preun canberra-system-bootup.service canberra-system-shutdown.service canberra-system-shutdown-reboot.service %postun -/sbin/ldconfig +%{?ldconfig_ %systemd_postun -%post gtk2 -p /sbin/ldconfig -%postun gtk2 -p /sbin/ldconfig +%ldconfig_scriptlets gtk2 -%post gtk3 -p /sbin/ldconfig -%postun gtk3 -p /sbin/ldconfig +%ldconfig_scriptlets gtk3 %prep %setup -q From 939b00c168071cd163464babc4c807a9bfb0e578 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:51 +0100 Subject: [PATCH 54/78] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- libcanberra.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libcanberra.spec b/libcanberra.spec index 50b0f76..bf152f1 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -2,7 +2,6 @@ Name: libcanberra Version: 0.30 Release: 17%{?dist} Summary: Portable Sound Event Library -Group: System Environment/Libraries Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch @@ -33,7 +32,6 @@ 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}%{?_isa} = %{version}-%{release} # Some other stuff is included in the gtk3 package, so always pull that in. Requires: %{name}-gtk3%{?_isa} = %{version}-%{release} @@ -43,7 +41,6 @@ Gtk+ 2.x bindings for libcanberra %package gtk3 Summary: Gtk+ 3.x Bindings for libcanberra -Group: System Environment/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} %description gtk3 @@ -51,7 +48,6 @@ Gtk+ 3.x bindings for libcanberra %package devel Summary: Development Files for libcanberra Client Development -Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}-gtk2%{?_isa} = %{version}-%{release} Requires: %{name}-gtk3%{?_isa} = %{version}-%{release} From d9891ebcde4f748c6ab381a2678c8fa1734212e3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 06:46:31 +0000 Subject: [PATCH 55/78] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libcanberra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libcanberra.spec b/libcanberra.spec index bf152f1..b64fab0 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,6 +1,6 @@ Name: libcanberra Version: 0.30 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Portable Sound Event Library Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz @@ -137,6 +137,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Fri Feb 01 2019 Fedora Release Engineering +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jul 13 2018 Fedora Release Engineering - 0.30-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From d69fc37f931389094d5ee75dc98c0588cf2be0cf Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 12 Feb 2019 12:40:11 +0100 Subject: [PATCH 56/78] Fix typo in postun Signed-off-by: Igor Gnatenko --- libcanberra.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libcanberra.spec b/libcanberra.spec index b64fab0..a976b7a 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,6 +1,6 @@ Name: libcanberra Version: 0.30 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Portable Sound Event Library Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz @@ -64,7 +64,7 @@ Development Files for libcanberra Client Development %systemd_preun canberra-system-bootup.service canberra-system-shutdown.service canberra-system-shutdown-reboot.service %postun -%{?ldconfig_ +%{?ldconfig} %systemd_postun %ldconfig_scriptlets gtk2 @@ -137,6 +137,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Tue Feb 12 2019 Igor Gnatenko - 0.30-19 +- Fix typo in postun + * Fri Feb 01 2019 Fedora Release Engineering - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From b6fab3c714b2e033cea723d2cea88337d51ad427 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 12:53:56 +0000 Subject: [PATCH 57/78] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libcanberra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libcanberra.spec b/libcanberra.spec index a976b7a..613dd74 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,6 +1,6 @@ Name: libcanberra Version: 0.30 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Portable Sound Event Library Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz @@ -137,6 +137,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 0.30-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Tue Feb 12 2019 Igor Gnatenko - 0.30-19 - Fix typo in postun From 8da8f91f0f913f0ca2f7481e81ed37663ae34d28 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Fri, 8 Nov 2019 11:43:32 -0500 Subject: [PATCH 58/78] remove %%systemd_postun macro to fix FTBFS --- libcanberra.spec | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/libcanberra.spec b/libcanberra.spec index 613dd74..8edbec7 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,14 +1,12 @@ Name: libcanberra Version: 0.30 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Portable Sound Event Library Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz - Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch - License: LGPLv2+ Url: http://git.0pointer.de/?p=libcanberra.git;a=summary -BuildRequires: gcc +BuildRequires: gcc BuildRequires: gtk2-devel BuildRequires: gtk3-devel BuildRequires: alsa-lib-devel @@ -63,9 +61,7 @@ Development Files for libcanberra Client Development %preun %systemd_preun canberra-system-bootup.service canberra-system-shutdown.service canberra-system-shutdown-reboot.service -%postun -%{?ldconfig} -%systemd_postun +%ldconfig_postun %ldconfig_scriptlets gtk2 @@ -137,6 +133,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Fri Nov 8 2019 Tom Callaway - 0.30-21 +- remove %%systemd_postun macro to fix FTBFS + * Thu Jul 25 2019 Fedora Release Engineering - 0.30-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From eacd18055219c25a78c40e481d04e4746dabb293 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 08:42:11 +0000 Subject: [PATCH 59/78] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libcanberra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libcanberra.spec b/libcanberra.spec index 8edbec7..a200261 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,6 +1,6 @@ Name: libcanberra Version: 0.30 -Release: 21%{?dist} +Release: 22%{?dist} Summary: Portable Sound Event Library Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch @@ -133,6 +133,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 0.30-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Nov 8 2019 Tom Callaway - 0.30-21 - remove %%systemd_postun macro to fix FTBFS From 26651c2d61debc58db053290ed840912c90d2e03 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 04:19:58 +0000 Subject: [PATCH 60/78] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libcanberra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libcanberra.spec b/libcanberra.spec index a200261..f4aa8a4 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,6 +1,6 @@ Name: libcanberra Version: 0.30 -Release: 22%{?dist} +Release: 23%{?dist} Summary: Portable Sound Event Library Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch @@ -133,6 +133,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 0.30-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jan 29 2020 Fedora Release Engineering - 0.30-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From facc3fa810f0831de0f17bb2b1bc3fefe0d78384 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 5 Jan 2021 01:30:08 +0000 Subject: [PATCH 61/78] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- libcanberra.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/libcanberra.spec b/libcanberra.spec index f4aa8a4..374009c 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -18,6 +18,7 @@ BuildRequires: gstreamer1-devel BuildRequires: libtdb-devel BuildRequires: gettext-devel BuildRequires: systemd-devel +BuildRequires: make Requires: sound-theme-freedesktop Requires: pulseaudio-libs >= 0.9.15 Requires(post): systemd From 49987b84525fdad70900f5d3db53fd2a0a439dd2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 16:44:56 +0000 Subject: [PATCH 62/78] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libcanberra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libcanberra.spec b/libcanberra.spec index 374009c..a21fa49 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,6 +1,6 @@ Name: libcanberra Version: 0.30 -Release: 23%{?dist} +Release: 24%{?dist} Summary: Portable Sound Event Library Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch @@ -134,6 +134,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 0.30-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 0.30-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 22e5da24b0aea84347120ce31d766b1a233455d4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 11:02:46 +0000 Subject: [PATCH 63/78] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libcanberra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libcanberra.spec b/libcanberra.spec index a21fa49..6df8827 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,6 +1,6 @@ Name: libcanberra Version: 0.30 -Release: 24%{?dist} +Release: 25%{?dist} Summary: Portable Sound Event Library Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch @@ -134,6 +134,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 0.30-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 0.30-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From a16560540f7d008b2ae1981dfcb0d19285606698 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 1 Oct 2021 13:09:44 +0200 Subject: [PATCH 64/78] Avoid requiring systemd as per updated packaging guidelines There is no need to require systemd for the systemd scriptlets as systemd correctly handles reloading depending on the transaction ordering (even if systemd is installed _after_ the package that installs the unit file). --- libcanberra.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libcanberra.spec b/libcanberra.spec index 6df8827..db7420d 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,6 +1,6 @@ Name: libcanberra Version: 0.30 -Release: 25%{?dist} +Release: 26%{?dist} Summary: Portable Sound Event Library Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch @@ -21,9 +21,6 @@ BuildRequires: systemd-devel BuildRequires: make Requires: sound-theme-freedesktop Requires: pulseaudio-libs >= 0.9.15 -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd %description A small and lightweight implementation of the XDG Sound Theme Specification @@ -134,6 +131,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Fri Oct 01 2021 Kalev Lember - 0.30-26 +- Avoid requiring systemd as per updated packaging guidelines + * Thu Jul 22 2021 Fedora Release Engineering - 0.30-25 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 859b4716c966e14f661e545a5b4b9dd2c664163f Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 1 Oct 2021 13:11:00 +0200 Subject: [PATCH 65/78] Drop ldconfig scriptlets They are noop these days. --- libcanberra.spec | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/libcanberra.spec b/libcanberra.spec index db7420d..5abef8e 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -53,18 +53,11 @@ Requires: gtk2-devel Development Files for libcanberra Client Development %post -%{?ldconfig} %systemd_post canberra-system-bootup.service canberra-system-shutdown.service canberra-system-shutdown-reboot.service %preun %systemd_preun canberra-system-bootup.service canberra-system-shutdown.service canberra-system-shutdown-reboot.service -%ldconfig_postun - -%ldconfig_scriptlets gtk2 - -%ldconfig_scriptlets gtk3 - %prep %setup -q %patch0 -p1 @@ -133,6 +126,7 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %changelog * Fri Oct 01 2021 Kalev Lember - 0.30-26 - Avoid requiring systemd as per updated packaging guidelines +- Drop ldconfig scriptlets * Thu Jul 22 2021 Fedora Release Engineering - 0.30-25 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 6dd04456bf92c63613282d9d73dc4a3611257038 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 15:51:43 +0000 Subject: [PATCH 66/78] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libcanberra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libcanberra.spec b/libcanberra.spec index 5abef8e..c071066 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,6 +1,6 @@ Name: libcanberra Version: 0.30 -Release: 26%{?dist} +Release: 27%{?dist} Summary: Portable Sound Event Library Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch @@ -124,6 +124,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 0.30-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Oct 01 2021 Kalev Lember - 0.30-26 - Avoid requiring systemd as per updated packaging guidelines - Drop ldconfig scriptlets From 8321a12330209c06b9e9a28f1a835c1cce1d6beb Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Sun, 6 Feb 2022 18:45:51 +0100 Subject: [PATCH 67/78] + libcanberra-0.30-27 Update X11 avoidance patch --- ...-all-GdkDisplays-are-GdkX11Displays-.patch | 63 +++++++++++++++++-- libcanberra.spec | 6 +- 2 files changed, 63 insertions(+), 6 deletions(-) diff --git a/0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch b/0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch index 6187900..763c3a9 100644 --- a/0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch +++ b/0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch @@ -1,13 +1,14 @@ -From c0620e432650e81062c1967cc669829dbd29b310 Mon Sep 17 00:00:00 2001 +From d6dd5cdf45c1aac6c0519c8a4f5f89321770fb53 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Fri, 9 Nov 2012 16:16:40 +0000 Subject: [PATCH] gtk: Don't assume all GdkDisplays are GdkX11Displays: broadway/wayland +Co-Authored-By: Bastien Nocera --- src/canberra-gtk-module.c | 15 +++++++++++++++ - src/canberra-gtk.c | 5 +++++ - 2 files changed, 20 insertions(+) + src/canberra-gtk.c | 28 ++++++++++++++++++++++------ + 2 files changed, 37 insertions(+), 6 deletions(-) diff --git a/src/canberra-gtk-module.c b/src/canberra-gtk-module.c index 67791f0..c1532ab 100644 @@ -50,7 +51,7 @@ index 67791f0..c1532ab 100644 * ignore them */ diff --git a/src/canberra-gtk.c b/src/canberra-gtk.c -index 34446f5..08cb668 100644 +index 34446f5..47285f8 100644 --- a/src/canberra-gtk.c +++ b/src/canberra-gtk.c @@ -185,6 +185,11 @@ static gint window_get_desktop(GdkDisplay *d, GdkWindow *w) { @@ -65,6 +66,58 @@ index 34446f5..08cb668 100644 if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), GDK_WINDOW_XID(w), gdk_x11_get_xatom_by_name_for_display(d, "_NET_WM_DESKTOP"), 0, G_MAXLONG, False, XA_CARDINAL, &type_return, +@@ -254,18 +259,28 @@ int ca_gtk_proplist_set_for_widget(ca_proplist *p, GtkWidget *widget) { + + if (gtk_widget_get_realized(GTK_WIDGET(w))) { + GdkWindow *dw = NULL; ++#ifdef GDK_IS_X11_DISPLAY + GdkScreen *screen = NULL; ++#endif + GdkDisplay *display = NULL; + gint x = -1, y = -1, width = -1, height = -1, screen_width = -1, screen_height = -1; + +- if ((dw = gtk_widget_get_window(GTK_WIDGET(w)))) +- if ((ret = ca_proplist_setf(p, CA_PROP_WINDOW_X11_XID, "%lu", (unsigned long) GDK_WINDOW_XID(dw))) < 0) +- return ret; ++ if ((dw = gtk_widget_get_window(GTK_WIDGET(w)))) { ++#ifdef GDK_IS_X11_DISPLAY ++ if (GDK_IS_X11_DISPLAY(display)) { ++ if ((ret = ca_proplist_setf(p, CA_PROP_WINDOW_X11_XID, "%lu", (unsigned long) GDK_WINDOW_XID(dw))) < 0) ++ return ret; ++ } ++#endif ++ } + + if ((display = gtk_widget_get_display(GTK_WIDGET(w)))) { +- if ((t = gdk_display_get_name(display))) ++#ifdef GDK_IS_X11_DISPLAY ++ if (GDK_IS_X11_DISPLAY(display) && (t = gdk_display_get_name(display))) { + if ((ret = ca_proplist_sets(p, CA_PROP_WINDOW_X11_DISPLAY, t)) < 0) + return ret; ++ } ++#endif + + if (dw) { + gint desktop = window_get_desktop(display, dw); +@@ -276,7 +291,8 @@ int ca_gtk_proplist_set_for_widget(ca_proplist *p, GtkWidget *widget) { + } + } + +- if ((screen = gtk_widget_get_screen(GTK_WIDGET(w)))) { ++#ifdef GDK_IS_X11_DISPLAY ++ if (GDK_IS_X11_DISPLAY(display) && (screen = gtk_widget_get_screen(GTK_WIDGET(w)))) { + + if ((ret = ca_proplist_setf(p, CA_PROP_WINDOW_X11_SCREEN, "%i", gdk_screen_get_number(screen))) < 0) + return ret; +@@ -285,7 +301,7 @@ int ca_gtk_proplist_set_for_widget(ca_proplist *p, GtkWidget *widget) { + if ((ret = ca_proplist_setf(p, CA_PROP_WINDOW_X11_MONITOR, "%i", gdk_screen_get_monitor_at_window(screen, dw))) < 0) + return ret; + } +- ++#endif + /* FIXME, this might cause a round trip */ + + if (dw) { -- -1.9.0 +2.34.1 diff --git a/libcanberra.spec b/libcanberra.spec index c071066..377ed3c 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,6 +1,6 @@ Name: libcanberra Version: 0.30 -Release: 27%{?dist} +Release: 28%{?dist} Summary: Portable Sound Event Library Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch @@ -124,6 +124,10 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Sun Feb 06 2022 Bastien Nocera - 0.30-28 ++ libcanberra-0.30-27 +- Update X11 avoidance patch + * Thu Jan 20 2022 Fedora Release Engineering - 0.30-27 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 461f39a003c02e71ec9964a6b77673e631001aa8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 17:25:15 +0000 Subject: [PATCH 68/78] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libcanberra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libcanberra.spec b/libcanberra.spec index 377ed3c..c3c3742 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,6 +1,6 @@ Name: libcanberra Version: 0.30 -Release: 28%{?dist} +Release: 29%{?dist} Summary: Portable Sound Event Library Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch @@ -124,6 +124,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 0.30-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sun Feb 06 2022 Bastien Nocera - 0.30-28 + libcanberra-0.30-27 - Update X11 avoidance patch From a25d1b641853dee397e2771efef95b5d926eb9ce Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Tue, 10 Jan 2023 15:24:23 +0100 Subject: [PATCH 69/78] Don't build GTK 2 bits on ELN/RHEL 10 GTK 2 won't be part of RHEL 10, see the following announcements: https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/KH2BKEOZTLV4G6WF5FUXU6RYDPC62UEX/ https://github.com/minimization/content-resolver-input/pull/724 https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/9.1_release_notes/deprecated_functionality#deprecated-functionality_desktop --- libcanberra.spec | 44 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/libcanberra.spec b/libcanberra.spec index c3c3742..c6b99a8 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,13 +1,22 @@ +# RHEL 10 won't ship with GTK 2, don't build bit there, but build them elsewhere +%if 0%{?rhel} > 9 +%bcond_with gtk2 +%else +%bcond_without gtk2 +%endif + Name: libcanberra Version: 0.30 -Release: 29%{?dist} +Release: 30%{?dist} Summary: Portable Sound Event Library Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch License: LGPLv2+ Url: http://git.0pointer.de/?p=libcanberra.git;a=summary BuildRequires: gcc +%if %{with gtk2} BuildRequires: gtk2-devel +%endif BuildRequires: gtk3-devel BuildRequires: alsa-lib-devel BuildRequires: libvorbis-devel @@ -26,6 +35,7 @@ Requires: pulseaudio-libs >= 0.9.15 A small and lightweight implementation of the XDG Sound Theme Specification (http://0pointer.de/public/sound-theme-spec.html). +%if %{with gtk2} %package gtk2 Summary: Gtk+ 2.x Bindings for libcanberra Requires: %{name}%{?_isa} = %{version}-%{release} @@ -34,6 +44,7 @@ Requires: %{name}-gtk3%{?_isa} = %{version}-%{release} %description gtk2 Gtk+ 2.x bindings for libcanberra +%endif %package gtk3 Summary: Gtk+ 3.x Bindings for libcanberra @@ -45,9 +56,11 @@ Gtk+ 3.x bindings for libcanberra %package devel Summary: Development Files for libcanberra Client Development Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: %{name}-gtk2%{?_isa} = %{version}-%{release} Requires: %{name}-gtk3%{?_isa} = %{version}-%{release} +%if %{with gtk2} +Requires: %{name}-gtk2%{?_isa} = %{version}-%{release} Requires: gtk2-devel +%endif %description devel Development Files for libcanberra Client Development @@ -63,7 +76,17 @@ Development Files for libcanberra Client Development %patch0 -p1 %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 \ +%if %{without gtk2} + --disable-gtk \ +%endif + --enable-null \ + --disable-oss \ + --with-builtin=dso \ + --with-systemdsystemunitdir=/usr/lib/systemd/system make %{?_smp_mflags} %install @@ -86,9 +109,11 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_prefix}/lib/systemd/system/canberra-system-shutdown.service %{_bindir}/canberra-boot +%if %{with gtk2} %files gtk2 %{_libdir}/libcanberra-gtk.so.* %{_libdir}/gtk-2.0/modules/libcanberra-gtk-module.so +%endif %files gtk3 %{_libdir}/libcanberra-gtk3.so.* @@ -111,12 +136,14 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %doc %{_datadir}/gtk-doc %{_includedir}/canberra-gtk.h %{_includedir}/canberra.h -%{_libdir}/libcanberra-gtk.so -%{_libdir}/libcanberra-gtk3.so %{_libdir}/libcanberra.so -%{_libdir}/pkgconfig/libcanberra-gtk.pc -%{_libdir}/pkgconfig/libcanberra-gtk3.pc %{_libdir}/pkgconfig/libcanberra.pc +%if %{with gtk2} +%{_libdir}/libcanberra-gtk.so +%{_libdir}/pkgconfig/libcanberra-gtk.pc +%endif +%{_libdir}/libcanberra-gtk3.so +%{_libdir}/pkgconfig/libcanberra-gtk3.pc # co-own these directories to avoid requiring vala %dir %{_datadir}/vala %dir %{_datadir}/vala/vapi @@ -124,6 +151,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Tue Jan 10 2023 Tomas Popela - 0.30-30 +- Don't build GTK 2 bits on ELN/RHEL 10 as GTK 2 won't be there + * Thu Jul 21 2022 Fedora Release Engineering - 0.30-29 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From e0a79493cd9c32309fed94bb507ea807cd29151c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 15:56:41 +0000 Subject: [PATCH 70/78] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libcanberra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libcanberra.spec b/libcanberra.spec index c6b99a8..dba30f8 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -7,7 +7,7 @@ Name: libcanberra Version: 0.30 -Release: 30%{?dist} +Release: 31%{?dist} Summary: Portable Sound Event Library Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch @@ -151,6 +151,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 0.30-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Jan 10 2023 Tomas Popela - 0.30-30 - Don't build GTK 2 bits on ELN/RHEL 10 as GTK 2 won't be there From a02eae378ba421ead4a7621cc7951deac2b547ed Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 10:26:05 +0000 Subject: [PATCH 71/78] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libcanberra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libcanberra.spec b/libcanberra.spec index dba30f8..e4e2ee8 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -7,7 +7,7 @@ Name: libcanberra Version: 0.30 -Release: 31%{?dist} +Release: 32%{?dist} Summary: Portable Sound Event Library Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch @@ -151,6 +151,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 0.30-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jan 19 2023 Fedora Release Engineering - 0.30-31 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From b26434df48d4002ffacc9dba40187c2cadf3bae6 Mon Sep 17 00:00:00 2001 From: Niels De Graef Date: Fri, 13 Oct 2023 09:47:38 +0200 Subject: [PATCH 72/78] Migrate to SPDX license --- libcanberra.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libcanberra.spec b/libcanberra.spec index e4e2ee8..b098db7 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -7,11 +7,11 @@ Name: libcanberra Version: 0.30 -Release: 32%{?dist} +Release: 33%{?dist} Summary: Portable Sound Event Library Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch -License: LGPLv2+ +License: LGPL-2.1-or-later Url: http://git.0pointer.de/?p=libcanberra.git;a=summary BuildRequires: gcc %if %{with gtk2} @@ -151,6 +151,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Fri Oct 13 2023 Niels De Graef - 0.30-33 +- Migrate to SPDX license + * Thu Jul 20 2023 Fedora Release Engineering - 0.30-32 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 086bbc76021a41cf630effcd8d72b0a299b0993b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 03:42:01 +0000 Subject: [PATCH 73/78] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- libcanberra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libcanberra.spec b/libcanberra.spec index b098db7..7f27de8 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -7,7 +7,7 @@ Name: libcanberra Version: 0.30 -Release: 33%{?dist} +Release: 34%{?dist} Summary: Portable Sound Event Library Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch @@ -151,6 +151,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 0.30-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Oct 13 2023 Niels De Graef - 0.30-33 - Migrate to SPDX license From da7f34cf62e6aabac9687313a4a1d0862c12c7fb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 01:39:29 +0000 Subject: [PATCH 74/78] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- libcanberra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libcanberra.spec b/libcanberra.spec index 7f27de8..5cd748a 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -7,7 +7,7 @@ Name: libcanberra Version: 0.30 -Release: 34%{?dist} +Release: 35%{?dist} Summary: Portable Sound Event Library Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch @@ -151,6 +151,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 0.30-35 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 0.30-34 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 4e8fff5d7d3a947fb368055368ad2dcdc99a077f Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:47 +0200 Subject: [PATCH 75/78] Eliminate use of obsolete %patchN syntax (#2283636) --- libcanberra.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libcanberra.spec b/libcanberra.spec index 5cd748a..67b6d8b 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -73,7 +73,7 @@ Development Files for libcanberra Client Development %prep %setup -q -%patch0 -p1 +%patch -P0 -p1 %build %configure \ From 1d15da375397d306a8500657f06c58e003366734 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 13:27:38 +0000 Subject: [PATCH 76/78] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- libcanberra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libcanberra.spec b/libcanberra.spec index 67b6d8b..1894a5d 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -7,7 +7,7 @@ Name: libcanberra Version: 0.30 -Release: 35%{?dist} +Release: 36%{?dist} Summary: Portable Sound Event Library Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch @@ -151,6 +151,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 0.30-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Thu Jan 25 2024 Fedora Release Engineering - 0.30-35 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 0df2bfea15d7a2189c9dabf84f145670c427b795 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 10:45:26 +0000 Subject: [PATCH 77/78] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- libcanberra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libcanberra.spec b/libcanberra.spec index 1894a5d..50cecaf 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -7,7 +7,7 @@ Name: libcanberra Version: 0.30 -Release: 36%{?dist} +Release: 37%{?dist} Summary: Portable Sound Event Library Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch @@ -151,6 +151,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 0.30-37 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jul 18 2024 Fedora Release Engineering - 0.30-36 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 29c011d17386df273f015256edd4c06530b6ebe1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 19:25:40 +0000 Subject: [PATCH 78/78] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- libcanberra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libcanberra.spec b/libcanberra.spec index 50cecaf..e3834df 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -7,7 +7,7 @@ Name: libcanberra Version: 0.30 -Release: 37%{?dist} +Release: 38%{?dist} Summary: Portable Sound Event Library Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch @@ -151,6 +151,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 0.30-38 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jan 17 2025 Fedora Release Engineering - 0.30-37 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild