dist-git conversion

#2781)

.cvsignore

@@ -1 +0,0 @@
-xfce-utils-4.4.1.tar.bz2

.gitignore

@@ -0,0 +1 @@
+xfce-utils-4.4.2.tar.bz2

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: xfce-utils
-# $Id$
-NAME := xfce-utils
-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)

sources

@@ -1 +1 @@
-f7d95088e327bd8a64164696d39a1966  xfce-utils-4.4.1.tar.bz2
+119dd3f1daedfa41e3be89bad8997336  xfce-utils-4.4.2.tar.bz2

xfce-utils-4.4.2-pulseaudio.patch

@@ -0,0 +1,17 @@
+diff -Nur xfce-utils-4.4.2.orig/scripts/xinitrc.in xfce-utils-4.4.2/scripts/xinitrc.in
+--- xfce-utils-4.4.2.orig/scripts/xinitrc.in	2007-11-17 12:31:32.000000000 -0700
++++ xfce-utils-4.4.2/scripts/xinitrc.in	2008-01-14 13:38:42.000000000 -0700
+@@ -9,6 +9,13 @@
+ 	fi
+ fi
+ 
++#
++# Fedora 8 and later use pulseaudio, start it for sound. 
++#
++if [ -x /usr/bin/pulseaudio ]; then
++	/usr/bin/pulseaudio -D
++fi
++
+ # $XDG_CONFIG_HOME defines the base directory relative to which user specific 
+ # configuration files should be stored. If $XDG_CONFIG_HOME is either not set 
+ # or empty, a default equal to $HOME/.config should be used.

xfce-utils.spec

@@ -2,12 +2,13 @@
 
 Summary: Utilities for the Xfce Desktop Environment
 Name: xfce-utils
-Version: 4.4.1
+Version: 4.4.2
 Release: 3%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.4.1/src/xfce-utils-4.4.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.4.2/src/xfce-utils-4.4.2.tar.bz2
 Source1: xfce4.desktop
+Patch0: xfce-utils-4.4.2-pulseaudio.patch
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: xfce-mcs-manager
@@ -28,6 +29,7 @@ This package includes utilities for the Xfce Desktop Environment
 
 %prep
 %setup -q
+%patch0 -p1 -b .pulseaudio
 
 %build
 %configure --enable-gdm
@@ -60,6 +62,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc README ChangeLog NEWS COPYING AUTHORS
 %attr(0755,root,root) 
 %{_sysconfdir}/xdg/xfce4/xinitrc
+%{_sysconfdir}/xdg/xfce4/Xft.xrdb
 %{_bindir}/*
 %{_datadir}/xfce4/AUTHORS
 %{_datadir}/xfce4/BSD
@@ -86,6 +89,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dbus-1/services/org.xfce.RunDialog.service
 
 %changelog
+* Mon Jan 14 2008 Kevin Fenzi <kevin@tummy.com> - 4.4.2-3
+- Patch correct file
+
+* Wed Jan 02 2008 Kevin Fenzi <kevin@tummy.com> - 4.4.2-2
+- Add patch to start pulseaudio if installed
+
+* Sun Nov 18 2007 Kevin Fenzi <kevin@tummy.com> - 4.4.2-1
+- Update to 4.4.2
+
 * Mon Aug 27 2007 Kevin Fenzi <kevin@tummy.com> - 4.4.1-3
 - Update License tag