From bfa0b029310515afcdd655c8296c940fc4fd5ea3 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 7 Nov 2008 04:14:42 +0000 Subject: [PATCH 1/4] Initialize branch F-10 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..dc32377 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-10 From 328f4f1259e4f5acca0bcd5ef3b4b303ff47db8d Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sun, 14 Dec 2008 21:33:52 +0000 Subject: [PATCH 2/4] Moved login sound to Application startup phase. --- ...n-Application-phase-of-gnome-session.patch | 30 +++++++++++++++++++ libcanberra.spec | 9 ++++-- 2 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 0001-Run-lc-l-s-in-Application-phase-of-gnome-session.patch diff --git a/0001-Run-lc-l-s-in-Application-phase-of-gnome-session.patch b/0001-Run-lc-l-s-in-Application-phase-of-gnome-session.patch new file mode 100644 index 0000000..86db54a --- /dev/null +++ b/0001-Run-lc-l-s-in-Application-phase-of-gnome-session.patch @@ -0,0 +1,30 @@ +From 5081594cb8cbb69fc282260388b2bb0164ce31dd Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Sun, 14 Dec 2008 22:04:01 +0100 +Subject: [PATCH] Run lc-l-s in "Application" phase of gnome-session + +There is no need to make g-s wait for this lc-l-s when it plays the +welcome tune. Hence move it to "Application" phase instead of "Desktop" +phase. + +This is a result of a discussion with Behdad Esfahbod to optimize the +login time. +--- + src/libcanberra-login-sound.desktop.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/libcanberra-login-sound.desktop.in b/src/libcanberra-login-sound.desktop.in +index 5b4cf7f..9fcf357 100644 +--- a/src/libcanberra-login-sound.desktop.in ++++ b/src/libcanberra-login-sound.desktop.in +@@ -4,6 +4,6 @@ Name=GNOME Login Sound + Exec=@bindir@/canberra-gtk-play --id="desktop-login" --description="GNOME Login" + OnlyShowIn=GNOME; + AutostartCondition=GNOME /desktop/gnome/sound/event_sounds +-X-GNOME-Autostart-Phase=Desktop ++X-GNOME-Autostart-Phase=Application + X-GNOME-Provides=login-sound + X-GNOME-Autostart-Notify=true +-- +1.6.0.5 + diff --git a/libcanberra.spec b/libcanberra.spec index ac17b4a..835b90e 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,6 +1,6 @@ Name: libcanberra Version: 0.10 -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 @@ -18,6 +18,7 @@ BuildRequires: libtdb-devel BuildRequires: GConf2-devel Requires: sound-theme-freedesktop Requires: pulseaudio-libs >= 0.9.11-1 +Patch1: 0001-Run-lc-l-s-in-Application-phase-of-gnome-session.patch %description A small and lightweight implementation of the XDG Sound Theme Specification @@ -68,6 +69,7 @@ fi %prep %setup -q +%patch1 -p1 -b .0001-Run-lc-l-s-in-Application-phase-of-gnome-session %build %configure --disable-static --disable-rpath --enable-pulse --enable-alsa --enable-null --with-builtin=dso @@ -114,7 +116,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/libcanberra.pc %changelog -* Fri Oct 10 2008 Lennart Poettering 0.10.2 +* Sun Dec 14 2008 Lennart Poettering 0.10-3 +- Moved login sound to "Application" startup phase. + +* Fri Oct 10 2008 Lennart Poettering 0.10-2 - Drop libcanberra-gtk-module.sh since the gconf stuff is supported just fine in current gnome-session already. * Mon Oct 6 2008 Lennart Poettering 0.10-1 From 5751e459a1974950d1aace4e5fa55abbcfb8717b Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:45:57 +0000 Subject: [PATCH 3/4] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6498fce..4ad9d15 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ 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 $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +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)) From f35ff6f7ca2446b336e065c55902500dec30110f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 20:45:53 +0000 Subject: [PATCH 4/4] 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 dc32377..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-10 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