dist-git conversion

#2781)

.cvsignore

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

.gitignore

@@ -0,0 +1 @@
+xfce-utils-4.4.3.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 @@
-119dd3f1daedfa41e3be89bad8997336  xfce-utils-4.4.2.tar.bz2
+6d6ae1f048e1dc1348ad050498af5a18  xfce-utils-4.4.3.tar.bz2

xfce-utils-4.4.3-gnome-screensaver.patch

@@ -0,0 +1,34 @@
+diff -dur xfce-utils-4.4.2.orig/scripts/xflock4 xfce-utils-4.4.2/scripts/xflock4
+--- xfce-utils-4.4.2.orig/scripts/xflock4	2007-11-17 20:31:32.000000000 +0100
++++ xfce-utils-4.4.2/scripts/xflock4	2008-08-02 04:15:55.000000000 +0200
+@@ -19,10 +19,10 @@
+ #  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ #
+ 
+-if test x"`which xscreensaver-command 2>/dev/null`" != x""; then
+-    xscreensaver-command -lock 
+-elif test x"`which gnome-screensaver-command 2>/dev/null`" != x""; then
++if ps ux | grep gnome-[s]creensaver > /dev/null 2>&1; then
+     gnome-screensaver-command --lock
++elif ps ux | grep x[s]creensaver > /dev/null 2>&1; then
++    xscreensaver-command -lock
+ else
+     xlock $*
+ fi
+diff -dur 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 20:31:32.000000000 +0100
++++ xfce-utils-4.4.2/scripts/xinitrc.in	2008-08-02 04:10:12.000000000 +0200
+@@ -55,10 +55,10 @@
+ 
+ # Launch xscreensaver (if available), but only as non-root user
+ if test $UID -gt 0 -a -z "$VNCSESSION"; then 
+-    if test x"`which xscreensaver 2>/dev/null`" != x""; then
+-        xscreensaver -no-splash &
+-    elif test x"`which gnome-screensaver 2>/dev/null`" != x""; then
++    if test x"`which gnome-screensaver 2>/dev/null`" != x""; then
+         gnome-screensaver &
++    elif test x"`which xscreensaver 2>/dev/null`" != x""; then
++        xscreensaver -no-splash &
+     fi
+ fi 
+ 

xfce-utils-4.4.3-xfterm4-bug.patch

@@ -0,0 +1,44 @@
+--- a/scripts/xfterm4	2007-11-25 17:45:31.000000000 +0000
++++ b/scripts/xfterm4	2007-11-25 17:45:41.000000000 +0000
+@@ -1,24 +1,15 @@
+ #!/bin/sh
+ 
+ if [ "$1" = "-e" ]; then
+-	if [ -n "$2" ]; then
+-		shift
+-		ESTRING="$@"
+-	else
+-		shift
+-	fi
++	shift
+ fi	
+ 
+ if [ -d "$*" ]; then
+ 	cd "$*"
+-elif [ -x "$*" ]; then
+-	cd `dirname "$*"`
+-	ESTRING="`which pauseme`"
+-	MSTRING="$*"
+-elif [ -f "$*" ]; then
++elif [ -f "$*" -a ! -x "$*" ]; then
+ 	ESTRING="`which less`"
+ 	MSTRING="$*"
+-elif [ "`echo $* | grep "http:/"`" -o "`echo $* | grep "ftp:"`" ]; then
++elif [ "`echo $* | grep "http:/"`" -o "`echo $* | grep "ftp:"`" -a ! -x "$*" ]; then
+ 	# This requires lynx or links. If you don't have it, don't drop URLs.
+ 	if which lynx >/dev/null 2>&1; then
+ 		ESTRING="`which lynx`"
+@@ -26,6 +17,13 @@
+ 		ESTRING="`which links`"
+ 	fi
+ 	MSTRING="$*"
++else
++	if which pauseme >/dev/null 2>&1; then
++		ESTRING="`which pauseme`"
++		MSTRING="$*"
++	else
++		ESTRING="$@"
++	fi
+ fi
+ 
+ if [ x"$ESTRING" = x"" ]; then

xfce-utils.spec

@@ -2,13 +2,15 @@
 
 Summary: Utilities for the Xfce Desktop Environment
 Name: xfce-utils
-Version: 4.4.2
-Release: 4%{?dist}
+Version: 4.4.3
+Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.4.2/src/xfce-utils-4.4.2.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfce-utils-%{version}.tar.bz2
 Source1: xfce4.desktop
 Patch0: xfce-utils-4.4.2-pulseaudio.patch
+Patch1: xfce-utils-4.4.3-xfterm4-bug.patch
+Patch2: xfce-utils-4.4.3-gnome-screensaver.patch
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: xfce-mcs-manager
@@ -30,9 +32,11 @@ This package includes utilities for the Xfce Desktop Environment
 %prep
 %setup -q
 %patch0 -p1 -b .pulseaudio
+%patch1 -p1 -b .buggy
+%patch2 -p1 -b .gnome-screensaver
 
 %build
-%configure --enable-gdm
+%configure --enable-gdm --disable-static
 
 make %{?_smp_mflags}
 
@@ -46,7 +50,6 @@ rm -f $RPM_BUILD_ROOT%{xsessiondir}/xfce.desktop
 
 install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{xsessiondir}/
 
-rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.a
 rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.la
 rm -rf $RPM_BUILD_ROOT/%{_datadir}/apps
 
@@ -57,6 +60,18 @@ rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/X11
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc README ChangeLog NEWS COPYING AUTHORS
@@ -69,15 +84,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/xfce4/COPYING
 %{_datadir}/xfce4/GPL
 %{_datadir}/xfce4/INFO
-%{_datadir}/xfce4/INFO.ca
-%{_datadir}/xfce4/INFO.es
-%{_datadir}/xfce4/INFO.fi
-%{_datadir}/xfce4/INFO.fr
-%{_datadir}/xfce4/INFO.it
-%{_datadir}/xfce4/INFO.ja
-%{_datadir}/xfce4/INFO.ru
-%{_datadir}/xfce4/INFO.uk
-%{_datadir}/xfce4/INFO.vi
+%lang(ca) %{_datadir}/xfce4/INFO.ca
+%lang(es) %{_datadir}/xfce4/INFO.es
+%lang(fi) %{_datadir}/xfce4/INFO.fi
+%lang(fr) %{_datadir}/xfce4/INFO.fr
+%lang(it) %{_datadir}/xfce4/INFO.it
+%lang(ja) %{_datadir}/xfce4/INFO.ja
+%lang(ru) %{_datadir}/xfce4/INFO.ru
+%lang(en_GB) %{_datadir}/xfce4/INFO.uk
+%lang(vi) %{_datadir}/xfce4/INFO.vi
 %{_datadir}/xfce4/LGPL
 %{_datadir}/xfce4/doc/*/images/*
 %{_datadir}/xfce4/doc/*/*.html
@@ -89,6 +104,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dbus-1/services/org.xfce.RunDialog.service
 
 %changelog
+* Mon Oct 27 2008 Christoph Wickert <cwickert@fedoraproject.org> - 4.4.3-1
+- Update to 4.4.3
+- Prefer gnome-screensaver over xscreensaver if installed
+- Make xflock4 check for running screensaver instead of installed ones
+- Rework pulseaudio patch
+- Configure with --disable-static
+- Run gtk-update-icon-cache in %%post and %%postun
+
 * Sun Feb 10 2008 Kevin Fenzi <kevin@tummy.com> - 4.4.2-4
 - Rebuild for gcc43