dist-git conversion

#2781)

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 <lennart@poettering.net>
+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
+

Makefile

@@ -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 $$/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)

import.log

@@ -1 +0,0 @@
-libcanberra-0_3-1_fc10:HEAD:libcanberra-0.3-1.fc10.src.rpm:1213637385

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 <lpoetter@redhat.com> 0.10.2
+* Sun Dec 14 2008 Lennart Poettering <lpoetter@redhat.com> 0.10-3
+- Moved login sound to "Application" startup phase.
+
+* Fri Oct 10 2008 Lennart Poettering <lpoetter@redhat.com> 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 <lpoetter@redhat.com> 0.10-1