rpms/xfce-utils/EL-5 xfce-utils-4.4.3-xfterm4-bug.patch, NONE, 1.1 xfce-utils-4.4.3-gnome-screensaver.patch, NONE, 1.1 sources, 1.8, 1.9 .cvsignore, 1.8, 1.9 xfce-utils.spec, 1.17, 1.18

Sun Jul 25 23:48:50 UTC 2010

Author: kevin

Update of /cvs/pkgs/rpms/xfce-utils/EL-5
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv22014

Modified Files:
	sources .cvsignore xfce-utils.spec 
Added Files:
	xfce-utils-4.4.3-xfterm4-bug.patch 
	xfce-utils-4.4.3-gnome-screensaver.patch 
Log Message:
initial version for epel5


xfce-utils-4.4.3-xfterm4-bug.patch:
 xfterm4 |   22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

--- NEW FILE xfce-utils-4.4.3-xfterm4-bug.patch ---
--- 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-4.4.3-gnome-screensaver.patch:
 xflock4    |    6 +++---
 xinitrc.in |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE xfce-utils-4.4.3-gnome-screensaver.patch ---
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 
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce-utils/EL-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	23 Apr 2007 02:47:55 -0000	1.8
+++ sources	25 Jul 2010 23:48:49 -0000	1.9
@@ -1 +1 @@
-f7d95088e327bd8a64164696d39a1966  xfce-utils-4.4.1.tar.bz2
+5d23407700d7e8c9751e17a5bc955109  xfce-utils-4.6.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce-utils/EL-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	23 Apr 2007 02:47:55 -0000	1.8
+++ .cvsignore	25 Jul 2010 23:48:49 -0000	1.9
@@ -1 +1 @@
-xfce-utils-4.4.1.tar.bz2
+xfce-utils-4.6.2.tar.bz2


Index: xfce-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce-utils/EL-5/xfce-utils.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- xfce-utils.spec	27 Aug 2007 21:26:11 -0000	1.17
+++ xfce-utils.spec	25 Jul 2010 23:48:49 -0000	1.18
@@ -2,35 +2,46 @@
 
 Summary: Utilities for the Xfce Desktop Environment
 Name: xfce-utils
-Version: 4.4.1
+Version: 4.6.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://archive.xfce.org/src/xfce/xfce-utils/4.6/xfce-utils-%{version}.tar.bz2
 Source1: xfce4.desktop
+Patch1: xfce-utils-4.4.3-xfterm4-bug.patch
+# modfied version of http://bugzilla.xfce.org/show_bug.cgi?id=3770
+Patch2: xfce-utils-4.4.3-gnome-screensaver.patch
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: xfce-mcs-manager
 Requires: xfwm4
 Requires: xfdesktop
+Requires: xfce4-doc
 Requires: /usr/bin/id
 BuildRequires: libxfcegui4-devel >= %{version}
-BuildRequires: libxfce4mcs-devel >= %{version}
-BuildRequires: xfce-mcs-manager-devel
-BuildRequires: imake
-BuildRequires: libXt-devel
 BuildRequires: gettext
 BuildRequires: dbus-devel 
 BuildRequires: dbus-glib-devel
+BuildRequires: perl(XML::Parser)
+BuildRequires: intltool
 
 %description
-This package includes utilities for the Xfce Desktop Environment
+This package includes utilities for the Xfce Desktop Environment.
+
+%package -n xfce4-doc
+Summary: Basic documentation for the Xfce Desktop Environment
+Group: Documentation
+#Requires: %{name} = %{version}-%{release}
+
+%description -n xfce4-doc
+This package includes common docs for the Xfce Desktop Environment.
 
 %prep
 %setup -q
+%patch1 -p1 -b .buggy
+%patch2 -p1 -b .gnome-screensaver
 
 %build
-%configure --enable-gdm
+%configure --enable-gdm --disable-static
 
 make %{?_smp_mflags}
 
@@ -42,50 +53,134 @@ mkdir -p $RPM_BUILD_ROOT%{xsessiondir}
 make install DESTDIR=$RPM_BUILD_ROOT
 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
+install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{xsessiondir}/
 
 %find_lang %{name}
 
-rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/X11
+# we need the doc package to own these 
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/xfce4/doc/{es,fr,id,it,ja,pt_BR,tr}/images
 
 %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
 %attr(0755,root,root) 
-%{_sysconfdir}/xdg/xfce4/xinitrc
-%{_bindir}/*
-%{_datadir}/xfce4/AUTHORS
-%{_datadir}/xfce4/BSD
-%{_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
-%{_datadir}/xfce4/LGPL
-%{_datadir}/xfce4/doc/*/images/*
-%{_datadir}/xfce4/doc/*/*.html
-%{_datadir}/xfce4/doc/xfce-mouse.png
-%{_datadir}/xfce4/doc/xfce.css
-%{_datadir}/xfce4/doc/xfce-chunk.css
-%{_datadir}/icons/*/*/*
+%config(noreplace) %{_sysconfdir}/xdg/xfce4/xinitrc
+%config(noreplace) %{_sysconfdir}/xdg/xfce4/Xft.xrdb
+%config(noreplace) %{_sysconfdir}/xdg/autostart/xfconf-migration-4.6.desktop
+%dir %{_libexecdir}/xfce4/xfconf-migration
+%{_libexecdir}/xfce4/xfconf-migration/xfconf-migration-4.6.pl
+%{_bindir}/startxfce4
+%{_bindir}/xfbrowser4
+%{_bindir}/xfce4-about
+%{_bindir}/xflock4
+%{_bindir}/xfmountdev4
+%{_bindir}/xfrun4
+%{_bindir}/xfterm4
+%{_datadir}/icons/hicolor/*/apps/*
 %{xsessiondir}/*
 %{_datadir}/dbus-1/services/org.xfce.RunDialog.service
 
+%files -n xfce4-doc
+%defattr(-,root,root,-)
+%doc COPYING
+%{_bindir}/xfhelp4
+%dir %{_datadir}/xfce4
+%doc %{_datadir}/xfce4/AUTHORS
+%doc %{_datadir}/xfce4/BSD
+%doc %{_datadir}/xfce4/COPYING
+%doc %{_datadir}/xfce4/GPL
+%doc %{_datadir}/xfce4/INFO
+%doc %lang(de) %{_datadir}/xfce4/INFO.de
+%doc %lang(ca) %{_datadir}/xfce4/INFO.ca
+%doc %lang(es) %{_datadir}/xfce4/INFO.es
+%doc %lang(fi) %{_datadir}/xfce4/INFO.fi
+%doc %lang(fr) %{_datadir}/xfce4/INFO.fr
+%doc %lang(it) %{_datadir}/xfce4/INFO.it
+%doc %lang(ja) %{_datadir}/xfce4/INFO.ja
+%doc %lang(ru) %{_datadir}/xfce4/INFO.ru
+%doc %lang(en_GB) %{_datadir}/xfce4/INFO.uk
+%doc %lang(vi) %{_datadir}/xfce4/INFO.vi
+%doc %{_datadir}/xfce4/LGPL
+%dir %{_datadir}/xfce4/doc
+%dir %{_datadir}/xfce4/doc/*
+%dir %{_datadir}/xfce4/doc/*/images
+%doc %{_datadir}/xfce4/doc/*/images/*
+%doc %{_datadir}/xfce4/doc/*/*.html
+%doc %{_datadir}/xfce4/doc/xfce-mouse.png
+%doc %{_datadir}/xfce4/doc/xfce.css
+%doc %{_datadir}/xfce4/doc/xfce-chunk.css
+
 %changelog
+* Sun Jul 25 2010 Kevin Fenzi <kevin at tummy.com> - 4.6.2-3
+- Remove noarch from docs subpackage for EL-5
+
+* Wed Jul 07 2010 Kevin Fenzi <kevin at tummy.com> - 4.6.2-2
+- Add Copying file to docs in doc subpackage.
+
+* Fri May 21 2010 Kevin Fenzi <kevin at tummy.com> - 4.6.2-1
+- Update to 4.6.2
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.6.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sun Apr 19 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.1-1
+- Update to 4.6.1
+
+* Mon Mar 02 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.0-2
+- Fix directory ownership problems
+- Make separate xfce4-doc package
+
+* Thu Feb 26 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.0-1
+- Update to 4.6.0
+- Remove unneeded BuildRequires
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.5.99.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Jan 26 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.99.1-1
+- Update to 4.5.99.1
+
+* Tue Jan 13 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.93-1
+- Update to 4.5.93
+
+* Sat Dec 27 2008 Kevin Fenzi <kevin at tummy.com> - 4.5.92-1
+- Update to 4.5.92
+
+* Mon Oct 27 2008 Christoph Wickert <cwickert at 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 at tummy.com> - 4.4.2-4
+- Rebuild for gcc43
+
+* Mon Jan 14 2008 Kevin Fenzi <kevin at tummy.com> - 4.4.2-3
+- Patch correct file
+
+* Wed Jan 02 2008 Kevin Fenzi <kevin at tummy.com> - 4.4.2-2
+- Add patch to start pulseaudio if installed
+
+* Sun Nov 18 2007 Kevin Fenzi <kevin at tummy.com> - 4.4.2-1
+- Update to 4.4.2
+
 * Mon Aug 27 2007 Kevin Fenzi <kevin at tummy.com> - 4.4.1-3
 - Update License tag
 

