From 9665b672c55cc0e70300bfb795e34efbffc60e7f Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:40:58 +0000 Subject: [PATCH 01/23] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index bcae37f..10fffb7 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: xfce-utils -# $Id$ +# $Id: Makefile,v 1.1 2005/03/19 18:24:42 kevin Exp $ 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 +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 55eb9215bbb1cf48105f274e0d1129eafe5dbf27 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 21 May 2010 23:18:31 +0000 Subject: [PATCH 02/23] Update to 4.6.2 --- .cvsignore | 2 +- sources | 2 +- xfce-utils.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index bbf4ae9..4df4636 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xfce-utils-4.6.1.tar.bz2 +xfce-utils-4.6.2.tar.bz2 diff --git a/sources b/sources index 67e9c43..7192564 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1aa2362b11e79e56d52ce0d265faf1b6 xfce-utils-4.6.1.tar.bz2 +5d23407700d7e8c9751e17a5bc955109 xfce-utils-4.6.2.tar.bz2 diff --git a/xfce-utils.spec b/xfce-utils.spec index 13f530d..685419e 100644 --- a/xfce-utils.spec +++ b/xfce-utils.spec @@ -2,11 +2,11 @@ Summary: Utilities for the Xfce Desktop Environment Name: xfce-utils -Version: 4.6.1 -Release: 2%{?dist} +Version: 4.6.2 +Release: 1%{?dist} License: GPLv2+ URL: http://www.xfce.org/ -Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfce-utils-%{version}.tar.bz2 +Source0: http://archive.xfce.org/src/xfce/xfce-utils/4.6/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 @@ -128,6 +128,9 @@ fi %doc %{_datadir}/xfce4/doc/xfce-chunk.css %changelog +* Fri May 21 2010 Kevin Fenzi - 4.6.2-1 +- Update to 4.6.2 + * Mon Jul 27 2009 Fedora Release Engineering - 4.6.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 2ad4c2f5265ff6308ceddb0aaa673b26dbb6c3c5 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 8 Jul 2010 01:01:47 +0000 Subject: [PATCH 03/23] Add Copying file to docs in doc subpackage. --- xfce-utils.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xfce-utils.spec b/xfce-utils.spec index 685419e..658b26d 100644 --- a/xfce-utils.spec +++ b/xfce-utils.spec @@ -3,7 +3,7 @@ Summary: Utilities for the Xfce Desktop Environment Name: xfce-utils Version: 4.6.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: http://www.xfce.org/ Source0: http://archive.xfce.org/src/xfce/xfce-utils/4.6/xfce-utils-%{version}.tar.bz2 @@ -100,6 +100,7 @@ fi %files -n xfce4-doc %defattr(-,root,root,-) +%doc COPYING %{_bindir}/xfhelp4 %dir %{_datadir}/xfce4 %doc %{_datadir}/xfce4/AUTHORS @@ -128,6 +129,9 @@ fi %doc %{_datadir}/xfce4/doc/xfce-chunk.css %changelog +* Wed Jul 07 2010 Kevin Fenzi - 4.6.2-2 +- Add Copying file to docs in doc subpackage. + * Fri May 21 2010 Kevin Fenzi - 4.6.2-1 - Update to 4.6.2 From 828a5f6d39db8efa7028427d0eb9880f69b6bf41 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:42:37 +0000 Subject: [PATCH 04/23] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile 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 10fffb7..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xfce-utils -# $Id: Makefile,v 1.1 2005/03/19 18:24:42 kevin Exp $ -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 $$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) From 6a29746c1ae79ac9632ac567ae29c9b410619a28 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Sat, 8 Jan 2011 23:36:06 +0100 Subject: [PATCH 05/23] - Update to 4.7.4 --- .gitignore | 1 + sources | 2 +- xfce-utils-4.4.2-pulseaudio.patch | 17 -- xfce-utils-4.4.3-gnome-screensaver.patch | 34 ---- xfce-utils-4.4.3-xfterm4-bug.patch | 44 ----- xfce-utils-4.7.1-pulseaudio.patch | 14 ++ ...-utils-4.7.1-test-running-screensver.patch | 14 ++ xfce-utils-4.7.3-pulseaudio.patch | 14 ++ xfce-utils.spec | 161 ++++++++++-------- xfce4.desktop | 49 ------ 10 files changed, 135 insertions(+), 215 deletions(-) delete mode 100644 xfce-utils-4.4.2-pulseaudio.patch delete mode 100644 xfce-utils-4.4.3-gnome-screensaver.patch delete mode 100644 xfce-utils-4.4.3-xfterm4-bug.patch create mode 100644 xfce-utils-4.7.1-pulseaudio.patch create mode 100644 xfce-utils-4.7.1-test-running-screensver.patch create mode 100644 xfce-utils-4.7.3-pulseaudio.patch delete mode 100644 xfce4.desktop diff --git a/.gitignore b/.gitignore index 4df4636..52d75f9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ xfce-utils-4.6.2.tar.bz2 +/xfce-utils-4.7.4.tar.bz2 diff --git a/sources b/sources index 7192564..054d89d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5d23407700d7e8c9751e17a5bc955109 xfce-utils-4.6.2.tar.bz2 +2f57594fd504a1a013d0ca5dea898d58 xfce-utils-4.7.4.tar.bz2 diff --git a/xfce-utils-4.4.2-pulseaudio.patch b/xfce-utils-4.4.2-pulseaudio.patch deleted file mode 100644 index 4ce531b..0000000 --- a/xfce-utils-4.4.2-pulseaudio.patch +++ /dev/null @@ -1,17 +0,0 @@ -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 test x"`which pulseaudio 2>/dev/null`" != x""; then -+ 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. diff --git a/xfce-utils-4.4.3-gnome-screensaver.patch b/xfce-utils-4.4.3-gnome-screensaver.patch deleted file mode 100644 index d53e94e..0000000 --- a/xfce-utils-4.4.3-gnome-screensaver.patch +++ /dev/null @@ -1,34 +0,0 @@ -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 - diff --git a/xfce-utils-4.4.3-xfterm4-bug.patch b/xfce-utils-4.4.3-xfterm4-bug.patch deleted file mode 100644 index 23de5b3..0000000 --- a/xfce-utils-4.4.3-xfterm4-bug.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- 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 diff --git a/xfce-utils-4.7.1-pulseaudio.patch b/xfce-utils-4.7.1-pulseaudio.patch new file mode 100644 index 0000000..ba6bb13 --- /dev/null +++ b/xfce-utils-4.7.1-pulseaudio.patch @@ -0,0 +1,14 @@ +--- xfce-utils-4.7.1.orig/scripts/xinitrc.in 2010-11-07 10:52:24.000000000 +0100 ++++ xfce-utils-4.7.1/scripts/xinitrc.in 2010-11-13 10:46:16.437804690 +0100 +@@ -9,6 +9,11 @@ + fi + fi + ++# Fedora 8 and later use pulseaudio, start it for sound. ++if test x"`which pulseaudio 2>/dev/null`" != x""; then ++ 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. diff --git a/xfce-utils-4.7.1-test-running-screensver.patch b/xfce-utils-4.7.1-test-running-screensver.patch new file mode 100644 index 0000000..1e6a9f9 --- /dev/null +++ b/xfce-utils-4.7.1-test-running-screensver.patch @@ -0,0 +1,14 @@ +--- xfce-utils-4.7.1.orig/scripts/xflock4 2010-11-07 10:52:14.000000000 +0100 ++++ xfce-utils-4.7.1/scripts/xflock4 2010-11-13 11:19:27.326293458 +0100 +@@ -19,9 +19,9 @@ + # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + # + +-if test x"`which xscreensaver-command 2>/dev/null`" != x""; then ++if ps ux | grep x[s]creensaver > /dev/null 2>&1; then + xscreensaver-command -lock +-elif test x"`which gnome-screensaver-command 2>/dev/null`" != x""; then ++elif ps ux | grep gnome-[s]creensaver > /dev/null 2>&1; then + gnome-screensaver-command --lock + elif test x"`which slock 2>/dev/null`" != x""; then + slock diff --git a/xfce-utils-4.7.3-pulseaudio.patch b/xfce-utils-4.7.3-pulseaudio.patch new file mode 100644 index 0000000..690c408 --- /dev/null +++ b/xfce-utils-4.7.3-pulseaudio.patch @@ -0,0 +1,14 @@ +--- xfce-utils-4.7.3.orig/scripts/xinitrc.in 2010-12-05 15:39:24.000000000 +0100 ++++ xfce-utils-4.7.3/scripts/xinitrc.in 2010-12-05 17:06:41.275733920 +0100 +@@ -9,6 +9,11 @@ + fi + fi + ++# Fedora 8 and later use pulseaudio, start it for sound. ++if test x"`which pulseaudio 2>/dev/null`" != x""; then ++ pulseaudio -D & ++fi ++ + # set $XDG_MENU_PREFIX to "xfce-" so that "xfce-applications.menu" is picked + # over "applications.menu" in all Xfce applications. + if test "x$XDG_MENU_PREFIX" = "x"; then diff --git a/xfce-utils.spec b/xfce-utils.spec index 658b26d..3b5fadf 100644 --- a/xfce-utils.spec +++ b/xfce-utils.spec @@ -1,37 +1,43 @@ -%define xsessiondir %{_datadir}/xsessions +%global xfceversion 4.7 +%global xsessiondir %{_datadir}/xsessions -Summary: Utilities for the Xfce Desktop Environment -Name: xfce-utils -Version: 4.6.2 -Release: 2%{?dist} -License: GPLv2+ -URL: http://www.xfce.org/ -Source0: http://archive.xfce.org/src/xfce/xfce-utils/4.6/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 +Name: xfce-utils +Version: 4.7.4 +Release: 1%{?dist} +Summary: Utilities for the Xfce Desktop Environment + +Group: User Interface/Desktops +License: GPLv2+ +URL: http://www.xfce.org/ +Source0: http://archive.xfce.org/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2 +# FIXME: do we need to ship our own file? +#Source1: xfce4.desktop +Patch0: xfce-utils-4.7.3-pulseaudio.patch +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 +Patch2: xfce-utils-4.7.1-test-running-screensver.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Requires: xfwm4 -Requires: xfdesktop -Requires: xfce4-doc -Requires: /usr/bin/id -BuildRequires: libxfcegui4-devel >= %{version} -BuildRequires: gettext -BuildRequires: dbus-devel -BuildRequires: dbus-glib-devel -BuildRequires: perl(XML::Parser) -BuildRequires: intltool + +BuildRequires: libxfce4ui-devel >= %{xfceversion} +BuildRequires: gettext +BuildRequires: desktop-file-utils +BuildRequires: dbus-devel +BuildRequires: dbus-glib-devel +BuildRequires: perl(XML::Parser) +BuildRequires: intltool +Requires: xfwm4 +Requires: xfdesktop +Requires: xfce4-doc +Requires: /usr/bin/id + %description This package includes utilities for the Xfce Desktop Environment. -%package -n xfce4-doc -Summary: Basic documentation for the Xfce Desktop Environment -Group: Documentation -BuildArch: noarch +%package -n xfce4-doc +Summary: Basic documentation for the Xfce Desktop Environment +Group: Documentation +BuildArch: noarch #Requires: %{name} = %{version}-%{release} %description -n xfce4-doc @@ -40,44 +46,65 @@ This package includes common docs for the Xfce Desktop Environment. %prep %setup -q %patch0 -p1 -b .pulseaudio -%patch1 -p1 -b .buggy +%patch1 -p1 -b .xfterm4-bug %patch2 -p1 -b .gnome-screensaver + %build -%configure --enable-gdm --disable-static +%configure --disable-static make %{?_smp_mflags} + %install rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{xsessiondir} - -make install DESTDIR=$RPM_BUILD_ROOT -rm -f $RPM_BUILD_ROOT%{xsessiondir}/xfce.desktop - -install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{xsessiondir}/ - +make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' %find_lang %{name} +# FIXME: do we need to ship our own file? +#rm -f $RPM_BUILD_ROOT%{xsessiondir}/xfce.desktop +#install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{xsessiondir}/ +desktop-file-install --vendor="" --delete-original \ + --add-category="Documentation" \ + --remove-category="X-Xfce-Toplevel" \ + --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ + $RPM_BUILD_ROOT%{_datadir}/applications/xfce4-about.desktop + +desktop-file-install --vendor="" --delete-original \ + --add-category="Documentation" \ + --remove-category="X-Xfce-Toplevel" \ + --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ + $RPM_BUILD_ROOT%{_datadir}/applications/xfhelp4.desktop + +desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/xfrun4.desktop + +# FIXME: does not validate, see http://bugzilla.xfce.org/show_bug.cgi?id=6913 +desktop-file-validate $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/xfconf-migration-4.6.desktop + # 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 +mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/xfce4/doc/{ast,C,ca,da,es,fr,gl,id,it,ja,pt,tr,zh_CN}/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 +touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : + %postun -touch --no-create %{_datadir}/icons/hicolor -if [ -x %{_bindir}/gtk-update-icon-cache ] ; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +if [ $1 -eq 0 ] ; then + touch --no-create %{_datadir}/icons/hicolor &>/dev/null + gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : fi + +%posttrans +gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + + %files -f %{name}.lang %defattr(-,root,root,-) %doc README ChangeLog NEWS COPYING AUTHORS @@ -85,8 +112,6 @@ fi %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 @@ -94,41 +119,37 @@ fi %{_bindir}/xfmountdev4 %{_bindir}/xfrun4 %{_bindir}/xfterm4 -%{_datadir}/icons/hicolor/*/apps/* +%{_libdir}/xfce4/xfconf-migration/ +%{_datadir}/icons/hicolor/*/*/* %{xsessiondir}/* %{_datadir}/dbus-1/services/org.xfce.RunDialog.service +%{_datadir}/applications/*.desktop %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 +%{_docdir}/%{name}/ %changelog +* Sun Jan 02 2011 Christoph Wickert - 4.7.4-1 +- Update to 4.7.4 + +* Sun Dec 05 2010 Christoph Wickert - 4.7.3-1 +- Update to 4.7.3 + +* Fri Dec 03 2010 Christoph Wickert - 4.7.2-1 +- Update to 4.7.2 +- Update gtk-icon-cache scriptlets + +* Sat Nov 13 2010 Christoph Wickert - 4.7.1-1 +- Update to 4.7.1 + +* Sun Sep 05 2010 Christoph Wickert - 4.7.0-1 +- Update to 4.7.0 + * Wed Jul 07 2010 Kevin Fenzi - 4.6.2-2 - Add Copying file to docs in doc subpackage. diff --git a/xfce4.desktop b/xfce4.desktop deleted file mode 100644 index 57b0eb4..0000000 --- a/xfce4.desktop +++ /dev/null @@ -1,49 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Type=XSession -Exec=startxfce4 -TryExec=startxfce4 -Name=XFce 4 -Name[eo]=Facoj 4 -Name[pa]=XFce ੪ -Name[sv]=Xfce 4 -Comment=The Cholesterol Free Desktop Environment, version 4. A desktop environment reminiscent of CDE -Comment[bn]=দি কলেস্টরল ফ্রী ডেস্কটপ এনভায়রনমেন্ট, ৪র্থ সংস্করণ। CDE-র কথা মনে করিয়ে দেয় এমন একটি ডেস্কটপ এনভায়রনমেন্ট -Comment[bs]=Cholesterol Free Desktop Environment. Desktop okolina nalik na CDE -Comment[ca]=L'entorn d'escriptori sense colesterol, versió 4. Un entorn d'escriptori que recorda a CDE -Comment[cy]=Yr Amgylchedd Penbwrdd Di-Golesterol, fersiwn 4. Amgylchedd penbwrdd sy'n atgoffaol o CDE -Comment[da]=Det kolesterolfrie desktopmiljø, version 4. Et desktopmiljø der minder om CDE -Comment[de]=Cholesterol Free Desktop Environment, Version 4. Benutzerumgebung in der Art von CDE -Comment[el]=Το Cholesterol Free Desktop Environment, έκδοση 4. Ένα περιβάλλον επιφάνειας εργασίας βασισμένο στο CDE -Comment[eo]=La libera labortablo ĉirkaŭajo 4 -Comment[es]=El Cholesterol Free Desktop Environment, versión 4. Un entorno de escritorio que recuerda a CDE -Comment[et]=Kolesteroolivaba töölaua keskkond (versioon 4), mis meenutab mitmeti CDE-d -Comment[eu]=Kolesterolik gabeko idazmahai ingurunea, 4 bertsioa. CDE gogorarazten duen mahaigaina -Comment[fi]=Cholesterol Free -työpöytäympäristö. CDE:tä muisteleva työpöytäympäristö. -Comment[fr]=The Cholesterol Free Desktop Environment, version 4. Un environnement de bureau rappelant CDE -Comment[gl]=O Cholesterol Free Desktop Environment, versión 4. Un entorno de escritorio reminiscencia de CDE -Comment[he]=The Cholesterol Free Desktop Environment. גרסה 4, סביבת עבודה המזכירה את CDE -Comment[hu]=The Cholesterol Free Desktop Environment, 4-es verzió. Egy CDE-szerű ablakkezelő -Comment[is]=Kólesterol-lausa skjáborðsumhverfið, útgáfa 4. Skjáborð sem líkist CDE -Comment[it]=Il Cholesterol Free Desktop Environment, versione 4. Un desktop environment che ricorda CDE -Comment[ja]=Cholesterol Free Desktop Environment version 4 CDEを思わせる、むだのないデスクトップ環境 -Comment[mt]=Cholesterol Free Desktop Environment (v4). Ambjent grafiku li jixbaħ lis-CDE -Comment[nb]=Den Kolesterolfrie Brukerflate, versjon 4. Et skrivebordsmiljø som minner om CDE -Comment[nds]=De Cholesterol Free Desktop Environment, Verschoon 4. En Schriefdisch-Ümgeven, de wat liek is to CDE -Comment[nl]=De Cholesterol Free Desktop Environment, versie 4. Een desktop environment die herinnert aan CDE -Comment[nn]=Cholesterol Free Desktop Environment. Eit skrivebordsmiljø som minner om CDE -Comment[pa]=ਚੋਲੀਸਟੀਰੋਲ ਮੁਫਤ ਵਾਤਾਵਰਣ, ਵਰਜਨ ੪ ਇੱਕ CDE ਵਰਗਾ ਵਾਤਾਵਰਣ -Comment[pl]=Cholesterol Free Desktop Environment, wersja 4 - środowisko graficzne podobne do CDE. -Comment[pt]=O Cholesterol Free Desktop Environment, versão 4. Um ambiente de trabalho com vestígios do CDE -Comment[pt_BR]=Acrônimo para Cholesterol Free Desktop Environment (ou ambiente livre de colesterol), versão 4; um ambiente de trabalho remanescente do CDE -Comment[ro]=Cholesterol Free Desktop Environment, versiunea 4. Un mediu grafic cu reminescente din CDE -Comment[ru]="Не содержащая холестерина" рабочая среда xfce версии 4, напоминающая CDE -Comment[sk]=The Cholesterol Free Desktop Environment verzia 4. Pracovné prostredie pripomínajúce CDE -Comment[sl]=Cholesterol Free Desktop Environment, različica 4. Namizno okolje, podobno okolju CDE -Comment[sr]=„The Cholesterol Free Desktop Environment“ 4. издање. Радно окружење које подсећа на CDE -Comment[sr@Latn]=„The Cholesterol Free Desktop Environment“ 4. издање. Радно окружење које подсећа на CDE -Comment[sv]=Den kolesterolfria skrivbordsmiljön, version 4. En skrivbordsmiljö som påminner om CDE -Comment[ta]=கொலஸ்ட்ரால் இல்லாத மேல்மேசை சூழல். பதிப்பு 4. CDE பொருள்பொதிந்த மேல்மேசை சூழல் -Comment[tr]=Cholesterol Ücretsiz Masaüstü Ortamı, sürüm 4. CDE'nin benzeri olan masaüstü ortamı -Comment[uk]=The Cholesterol Free Desktop Environment, версія 4. Графічне середовище, що нагадує CDE -Comment[zh_CN]=胆固醇自由桌面环境，版本 4。CDE 桌面环境的追随者 From 11e5696ad634795d5f73f6f6da978c56dabf6a8b Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Sat, 8 Jan 2011 23:37:27 +0100 Subject: [PATCH 06/23] Some cleanups before build --- xfce-utils.spec | 7 ------- 1 file changed, 7 deletions(-) diff --git a/xfce-utils.spec b/xfce-utils.spec index 3b5fadf..ed53fae 100644 --- a/xfce-utils.spec +++ b/xfce-utils.spec @@ -10,8 +10,6 @@ Group: User Interface/Desktops License: GPLv2+ URL: http://www.xfce.org/ Source0: http://archive.xfce.org/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2 -# FIXME: do we need to ship our own file? -#Source1: xfce4.desktop Patch0: xfce-utils-4.7.3-pulseaudio.patch Patch1: xfce-utils-4.4.3-xfterm4-bug.patch # modfied version of http://bugzilla.xfce.org/show_bug.cgi?id=3770 @@ -38,7 +36,6 @@ This package includes utilities for the Xfce Desktop Environment. Summary: Basic documentation for the Xfce Desktop Environment Group: Documentation BuildArch: noarch -#Requires: %{name} = %{version}-%{release} %description -n xfce4-doc This package includes common docs for the Xfce Desktop Environment. @@ -61,9 +58,6 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' %find_lang %{name} -# FIXME: do we need to ship our own file? -#rm -f $RPM_BUILD_ROOT%{xsessiondir}/xfce.desktop -#install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{xsessiondir}/ desktop-file-install --vendor="" --delete-original \ --add-category="Documentation" \ @@ -79,7 +73,6 @@ desktop-file-install --vendor="" --delete-original \ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/xfrun4.desktop -# FIXME: does not validate, see http://bugzilla.xfce.org/show_bug.cgi?id=6913 desktop-file-validate $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/xfconf-migration-4.6.desktop # we need the doc package to own these From be2c5202e8675c807242d13b7cd16d855aa73194 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Sun, 9 Jan 2011 02:30:18 +0100 Subject: [PATCH 07/23] Add missing patch --- xfce-utils-4.4.3-xfterm4-bug.patch | 44 ++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 xfce-utils-4.4.3-xfterm4-bug.patch diff --git a/xfce-utils-4.4.3-xfterm4-bug.patch b/xfce-utils-4.4.3-xfterm4-bug.patch new file mode 100644 index 0000000..23de5b3 --- /dev/null +++ b/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 From fd5247486d7e9cb77e36f9959a9e2a7c7503f3a3 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sun, 16 Jan 2011 18:37:51 -0700 Subject: [PATCH 08/23] Update to 4.8.0 --- xfce-utils-4.8.0-fix-desktop-categories.patch | 9 +++++++++ xfce-utils.spec | 9 +++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 xfce-utils-4.8.0-fix-desktop-categories.patch diff --git a/xfce-utils-4.8.0-fix-desktop-categories.patch b/xfce-utils-4.8.0-fix-desktop-categories.patch new file mode 100644 index 0000000..ef8a332 --- /dev/null +++ b/xfce-utils-4.8.0-fix-desktop-categories.patch @@ -0,0 +1,9 @@ +diff -Nur xfce-utils-4.8.0.orig/scripts/xfconf-migration-4.6.desktop.in xfce-utils-4.8.0/scripts/xfconf-migration-4.6.desktop.in +--- xfce-utils-4.8.0.orig/scripts/xfconf-migration-4.6.desktop.in 2011-01-16 09:02:27.000000000 -0700 ++++ xfce-utils-4.8.0/scripts/xfconf-migration-4.6.desktop.in 2011-01-16 18:30:44.704493015 -0700 +@@ -5,4 +5,4 @@ + Terminal=false + Type=Application + StartupNotify=false +-Categories=Utility ++Categories=Utility; diff --git a/xfce-utils.spec b/xfce-utils.spec index ed53fae..9e10517 100644 --- a/xfce-utils.spec +++ b/xfce-utils.spec @@ -1,8 +1,8 @@ -%global xfceversion 4.7 +%global xfceversion 4.8 %global xsessiondir %{_datadir}/xsessions Name: xfce-utils -Version: 4.7.4 +Version: 4.8.0 Release: 1%{?dist} Summary: Utilities for the Xfce Desktop Environment @@ -14,6 +14,7 @@ Patch0: xfce-utils-4.7.3-pulseaudio.patch 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.7.1-test-running-screensver.patch +Patch3: xfce-utils-4.8.0-fix-desktop-categories.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: libxfce4ui-devel >= %{xfceversion} @@ -45,6 +46,7 @@ This package includes common docs for the Xfce Desktop Environment. %patch0 -p1 -b .pulseaudio %patch1 -p1 -b .xfterm4-bug %patch2 -p1 -b .gnome-screensaver +%patch3 -p1 -b .desktop-categories %build @@ -127,6 +129,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_docdir}/%{name}/ %changelog +* Sun Jan 16 2011 Kevin Fenzi - 4.8.0-1 +- Update to 4.8.0 + * Sun Jan 02 2011 Christoph Wickert - 4.7.4-1 - Update to 4.7.4 From 33c85d980f6dcb02a4656bfbc6ee7bd06a5544f5 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sun, 16 Jan 2011 18:38:23 -0700 Subject: [PATCH 09/23] Sources too... oops --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 52d75f9..15f1f31 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ xfce-utils-4.6.2.tar.bz2 /xfce-utils-4.7.4.tar.bz2 +/xfce-utils-4.8.0.tar.bz2 diff --git a/sources b/sources index 054d89d..a4cd5d8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2f57594fd504a1a013d0ca5dea898d58 xfce-utils-4.7.4.tar.bz2 +c49af3e718048d70b3fdd45fd4a8d281 xfce-utils-4.8.0.tar.bz2 From 74d373362606067768f550cb74dd83e0bfcc4edf Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sun, 30 Jan 2011 11:34:38 -0700 Subject: [PATCH 10/23] Update to 4.8.1 --- .gitignore | 1 + sources | 2 +- xfce-utils.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 15f1f31..a3c8079 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ xfce-utils-4.6.2.tar.bz2 /xfce-utils-4.7.4.tar.bz2 /xfce-utils-4.8.0.tar.bz2 +/xfce-utils-4.8.1.tar.bz2 diff --git a/sources b/sources index a4cd5d8..21f7005 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c49af3e718048d70b3fdd45fd4a8d281 xfce-utils-4.8.0.tar.bz2 +e39866365a45f7a1e7284b93eb4f92f0 xfce-utils-4.8.1.tar.bz2 diff --git a/xfce-utils.spec b/xfce-utils.spec index 9e10517..da86a47 100644 --- a/xfce-utils.spec +++ b/xfce-utils.spec @@ -2,7 +2,7 @@ %global xsessiondir %{_datadir}/xsessions Name: xfce-utils -Version: 4.8.0 +Version: 4.8.1 Release: 1%{?dist} Summary: Utilities for the Xfce Desktop Environment @@ -129,6 +129,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_docdir}/%{name}/ %changelog +* Sun Jan 30 2011 Kevin Fenzi - 4.8.1-1 +- Update to 4.8.1 + * Sun Jan 16 2011 Kevin Fenzi - 4.8.0-1 - Update to 4.8.0 From 8da002fc600c50e230d2885bbb30c60939fd2b67 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 22:08:55 -0600 Subject: [PATCH 11/23] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- xfce-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce-utils.spec b/xfce-utils.spec index da86a47..3a4ab46 100644 --- a/xfce-utils.spec +++ b/xfce-utils.spec @@ -3,7 +3,7 @@ Name: xfce-utils Version: 4.8.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Utilities for the Xfce Desktop Environment Group: User Interface/Desktops @@ -129,6 +129,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_docdir}/%{name}/ %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 4.8.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Sun Jan 30 2011 Kevin Fenzi - 4.8.1-1 - Update to 4.8.1 From 089a622f985313b53e2e2e19a55b256899d66c79 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 19 May 2011 15:15:48 -0600 Subject: [PATCH 12/23] Require xfce4-settings --- xfce-utils.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xfce-utils.spec b/xfce-utils.spec index 3a4ab46..9711de8 100644 --- a/xfce-utils.spec +++ b/xfce-utils.spec @@ -3,7 +3,7 @@ Name: xfce-utils Version: 4.8.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Utilities for the Xfce Desktop Environment Group: User Interface/Desktops @@ -27,6 +27,7 @@ BuildRequires: intltool Requires: xfwm4 Requires: xfdesktop Requires: xfce4-doc +Requires: xfce4-settings Requires: /usr/bin/id @@ -129,6 +130,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_docdir}/%{name}/ %changelog +* Thu May 19 2011 Orion Poplawski - 4.8.1-3 +- Require xfce4-settings + * Mon Feb 07 2011 Fedora Release Engineering - 4.8.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 78dfc26ea6dbf38131913481a2fca21f3909283b Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Sat, 18 Jun 2011 10:36:46 +0200 Subject: [PATCH 13/23] Update to 4.8.2 --- xfce-utils.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/xfce-utils.spec b/xfce-utils.spec index 9711de8..03c78f8 100644 --- a/xfce-utils.spec +++ b/xfce-utils.spec @@ -2,8 +2,8 @@ %global xsessiondir %{_datadir}/xsessions Name: xfce-utils -Version: 4.8.1 -Release: 3%{?dist} +Version: 4.8.2 +Release: 1%{?dist} Summary: Utilities for the Xfce Desktop Environment Group: User Interface/Desktops @@ -14,8 +14,8 @@ Patch0: xfce-utils-4.7.3-pulseaudio.patch 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.7.1-test-running-screensver.patch -Patch3: xfce-utils-4.8.0-fix-desktop-categories.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +Patch3: xfce-utils-4.8.0-fix-desktop-categories.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: libxfce4ui-devel >= %{xfceversion} BuildRequires: gettext @@ -130,6 +130,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_docdir}/%{name}/ %changelog +* Sat Jun 18 2011 Christoph Wickert - 4.8.2-1 +- Update to 4.8.2 + * Thu May 19 2011 Orion Poplawski - 4.8.1-3 - Require xfce4-settings From 4f1ac59d0ff5670c827c68605f209546df8f917d Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Sat, 18 Jun 2011 10:44:16 +0200 Subject: [PATCH 14/23] upload new source --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index a3c8079..7304ac6 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ xfce-utils-4.6.2.tar.bz2 /xfce-utils-4.7.4.tar.bz2 /xfce-utils-4.8.0.tar.bz2 /xfce-utils-4.8.1.tar.bz2 +/xfce-utils-4.8.2.tar.bz2 diff --git a/sources b/sources index 21f7005..238605c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e39866365a45f7a1e7284b93eb4f92f0 xfce-utils-4.8.1.tar.bz2 +7f48198f4bee3edf7869064c2922c609 xfce-utils-4.8.2.tar.bz2 From 988c743f65173ec58a7ce979f7ea7448042aa2c5 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 23 Sep 2011 09:50:01 -0600 Subject: [PATCH 15/23] Update to 4.8.3 --- .gitignore | 1 + sources | 2 +- xfce-utils.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7304ac6..368e0ca 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ xfce-utils-4.6.2.tar.bz2 /xfce-utils-4.8.0.tar.bz2 /xfce-utils-4.8.1.tar.bz2 /xfce-utils-4.8.2.tar.bz2 +/xfce-utils-4.8.3.tar.bz2 diff --git a/sources b/sources index 238605c..5bbb701 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7f48198f4bee3edf7869064c2922c609 xfce-utils-4.8.2.tar.bz2 +03b5fba5f63f4f1a31cc7d3728f3c87e xfce-utils-4.8.3.tar.bz2 diff --git a/xfce-utils.spec b/xfce-utils.spec index 03c78f8..6f3dc4d 100644 --- a/xfce-utils.spec +++ b/xfce-utils.spec @@ -2,7 +2,7 @@ %global xsessiondir %{_datadir}/xsessions Name: xfce-utils -Version: 4.8.2 +Version: 4.8.3 Release: 1%{?dist} Summary: Utilities for the Xfce Desktop Environment @@ -130,6 +130,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_docdir}/%{name}/ %changelog +* Fri Sep 23 2011 Kevin Fenzi - 4.8.3-1 +- Update to 4.8.3 + * Sat Jun 18 2011 Christoph Wickert - 4.8.2-1 - Update to 4.8.2 From fe03181b179a81c9e9aab85af0851ec80d2b87a2 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 9 Dec 2011 16:17:52 -0700 Subject: [PATCH 16/23] Stop gnome from running 4.6 migration on gnome logins. Fixes bug #760621 --- xfce-utils-4.8.3-46-migration-gnome.patch | 10 ++++++++++ xfce-utils.spec | 9 ++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 xfce-utils-4.8.3-46-migration-gnome.patch diff --git a/xfce-utils-4.8.3-46-migration-gnome.patch b/xfce-utils-4.8.3-46-migration-gnome.patch new file mode 100644 index 0000000..80bd0ae --- /dev/null +++ b/xfce-utils-4.8.3-46-migration-gnome.patch @@ -0,0 +1,10 @@ +diff -Nur xfce-utils-4.8.3.orig/scripts/xfconf-migration-4.6.desktop.in xfce-utils-4.8.3/scripts/xfconf-migration-4.6.desktop.in +--- xfce-utils-4.8.3.orig/scripts/xfconf-migration-4.6.desktop.in 2011-12-09 16:02:58.689214217 -0700 ++++ xfce-utils-4.8.3/scripts/xfconf-migration-4.6.desktop.in 2011-12-09 16:04:31.347779838 -0700 +@@ -5,4 +5,6 @@ + Terminal=false + Type=Application + StartupNotify=false ++X-GNOME-Autostart-enabled=false ++OnlyShowIn=XFCE; + Categories=Utility; diff --git a/xfce-utils.spec b/xfce-utils.spec index 6f3dc4d..a4c8731 100644 --- a/xfce-utils.spec +++ b/xfce-utils.spec @@ -3,7 +3,7 @@ Name: xfce-utils Version: 4.8.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Utilities for the Xfce Desktop Environment Group: User Interface/Desktops @@ -15,6 +15,9 @@ 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.7.1-test-running-screensver.patch Patch3: xfce-utils-4.8.0-fix-desktop-categories.patch +# Already upstream: http://git.xfce.org/xfce/xfce-utils/commit/?id=9b6d7d17b466d605e6cd3febd7291cc0f38c0336 +# Prevents gnome from running the 4.6 migration on gnome login. +Patch4: xfce-utils-4.8.3-46-migration-gnome.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: libxfce4ui-devel >= %{xfceversion} @@ -48,6 +51,7 @@ This package includes common docs for the Xfce Desktop Environment. %patch1 -p1 -b .xfterm4-bug %patch2 -p1 -b .gnome-screensaver %patch3 -p1 -b .desktop-categories +%patch4 -p1 -b .46-migration-gnome %build @@ -130,6 +134,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_docdir}/%{name}/ %changelog +* Fri Dec 09 2011 Kevin Fenzi - 4.8.3-2 +- Stop gnome from running 4.6 migration on gnome logins. Fixes bug #760621 + * Fri Sep 23 2011 Kevin Fenzi - 4.8.3-1 - Update to 4.8.3 From d1e16e47cf4e2071b6450687bfb153ae4718c6ac Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Fri, 30 Dec 2011 00:22:43 +0100 Subject: [PATCH 17/23] Don't try to remove $HOME if it is an xdg-user-dir (bugzilla.xfce.org #8154) xfrun4 is part of xfce4-appfinder in Fedora >= 17 --- ...utils-4.8.3-check_if_userdir_is_home.patch | 24 ++++++++++++ xfce-utils.spec | 39 +++++++++++++------ 2 files changed, 52 insertions(+), 11 deletions(-) create mode 100644 xfce-utils-4.8.3-check_if_userdir_is_home.patch diff --git a/xfce-utils-4.8.3-check_if_userdir_is_home.patch b/xfce-utils-4.8.3-check_if_userdir_is_home.patch new file mode 100644 index 0000000..85702eb --- /dev/null +++ b/xfce-utils-4.8.3-check_if_userdir_is_home.patch @@ -0,0 +1,24 @@ +diff --git a/scripts/xinitrc.in.in b/scripts/xinitrc.in.in +index f582934..e63eac1 100755 +--- a/scripts/xinitrc.in.in ++++ b/scripts/xinitrc.in.in +@@ -54,7 +54,8 @@ if test -f "$XDG_CONFIG_HOME/user-dirs.dirs"; then + # a bit of user dir migration... + if test -d "$HOME/Desktop" -a ! -L "$HOME/Desktop" \ + -a "$XDG_DESKTOP_DIR" \ +- -a "$HOME/Desktop" != "$XDG_DESKTOP_DIR" ++ -a "$HOME/Desktop" != "$XDG_DESKTOP_DIR" \ ++ -a "$HOME" != "$XDG_DESKTOP_DIR" + then + echo "Migrating $HOME/Desktop to $XDG_DESKTOP_DIR..." + test -d "$XDG_DESKTOP_DIR" && rmdir "$XDG_DESKTOP_DIR" +@@ -63,7 +64,8 @@ if test -f "$XDG_CONFIG_HOME/user-dirs.dirs"; then + + if test -d "$HOME/Templates" -a ! -L "$HOME/Templates" \ + -a "$XDG_TEMPLATES_DIR" \ +- -a "$HOME/Templates" != "$XDG_TEMPLATES_DIR" ++ -a "$HOME/Templates" != "$XDG_TEMPLATES_DIR" \ ++ -a "$HOME" != "$XDG_TEMPLATES_DIR" + then + echo "Migrating $HOME/Templates to $XDG_TEMPLATES_DIR..." + test -d "$XDG_TEMPLATES_DIR" && rmdir "$XDG_TEMPLATES_DIR" diff --git a/xfce-utils.spec b/xfce-utils.spec index a4c8731..3a60027 100644 --- a/xfce-utils.spec +++ b/xfce-utils.spec @@ -17,7 +17,9 @@ Patch2: xfce-utils-4.7.1-test-running-screensver.patch Patch3: xfce-utils-4.8.0-fix-desktop-categories.patch # Already upstream: http://git.xfce.org/xfce/xfce-utils/commit/?id=9b6d7d17b466d605e6cd3febd7291cc0f38c0336 # Prevents gnome from running the 4.6 migration on gnome login. -Patch4: xfce-utils-4.8.3-46-migration-gnome.patch +Patch4: xfce-utils-4.8.3-46-migration-gnome.patch +# taken from https://bugzilla.xfce.org/show_bug.cgi?id=8154 +Patch5: xfce-utils-4.8.3-check_if_userdir_is_home.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: libxfce4ui-devel >= %{xfceversion} @@ -52,6 +54,7 @@ This package includes common docs for the Xfce Desktop Environment. %patch2 -p1 -b .gnome-screensaver %patch3 -p1 -b .desktop-categories %patch4 -p1 -b .46-migration-gnome +%patch5 -p1 -b .check_if_userdir_is_home %build @@ -61,33 +64,38 @@ make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} -make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' +make install DESTDIR=%{buildroot} INSTALL='install -p' %find_lang %{name} desktop-file-install --vendor="" --delete-original \ --add-category="Documentation" \ --remove-category="X-Xfce-Toplevel" \ - --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ - $RPM_BUILD_ROOT%{_datadir}/applications/xfce4-about.desktop + --dir=%{buildroot}%{_datadir}/applications \ + %{buildroot}%{_datadir}/applications/xfce4-about.desktop desktop-file-install --vendor="" --delete-original \ --add-category="Documentation" \ --remove-category="X-Xfce-Toplevel" \ - --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ - $RPM_BUILD_ROOT%{_datadir}/applications/xfhelp4.desktop + --dir=%{buildroot}%{_datadir}/applications \ + %{buildroot}%{_datadir}/applications/xfhelp4.desktop -desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/xfrun4.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/xfrun4.desktop -desktop-file-validate $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/xfconf-migration-4.6.desktop +desktop-file-validate %{buildroot}%{_sysconfdir}/xdg/autostart/xfconf-migration-4.6.desktop # we need the doc package to own these -mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/xfce4/doc/{ast,C,ca,da,es,fr,gl,id,it,ja,pt,tr,zh_CN}/images +mkdir -p %{buildroot}%{_datadir}/xfce4/doc/{ast,C,ca,da,es,fr,gl,id,it,ja,pt,tr,zh_CN}/images + +# xfrun4 is part of xfce4-appfinder Fedora > 17 +%if 0%{?fedora} >= 17 +rm -f %{buildroot}%{_bindir}/xfrun4 +%endif %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %post @@ -117,7 +125,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_bindir}/xfce4-about %{_bindir}/xflock4 %{_bindir}/xfmountdev4 + +# xfrun4 is part of xfce4-appfinder Fedora > 17 +%if 0%{?fedora} < 17 %{_bindir}/xfrun4 +%endif + %{_bindir}/xfterm4 %{_libdir}/xfce4/xfconf-migration/ %{_datadir}/icons/hicolor/*/*/* @@ -134,6 +147,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_docdir}/%{name}/ %changelog +* Thu Dec 29 2011 Christoph Wickert - 4.8.3-3 +- Don't try to remove $HOME if it is an xdg-user-dir (bugzilla.xfce.org #8154) +- xfrun4 is part of xfce4-appfinder in Fedora >= 17 + * Fri Dec 09 2011 Kevin Fenzi - 4.8.3-2 - Stop gnome from running 4.6 migration on gnome logins. Fixes bug #760621 From e470067e70d77899ae0a032d37f83ddb6a6d4e71 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Fri, 30 Dec 2011 01:46:21 +0100 Subject: [PATCH 18/23] Fix release --- xfce-utils.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xfce-utils.spec b/xfce-utils.spec index 3a60027..d39ca1b 100644 --- a/xfce-utils.spec +++ b/xfce-utils.spec @@ -3,7 +3,7 @@ Name: xfce-utils Version: 4.8.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Utilities for the Xfce Desktop Environment Group: User Interface/Desktops From fdb29cb8db9711acb4933eeb972d5e690b00742d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 14 Jan 2012 02:46:24 -0600 Subject: [PATCH 19/23] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- xfce-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce-utils.spec b/xfce-utils.spec index d39ca1b..32307d7 100644 --- a/xfce-utils.spec +++ b/xfce-utils.spec @@ -3,7 +3,7 @@ Name: xfce-utils Version: 4.8.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Utilities for the Xfce Desktop Environment Group: User Interface/Desktops @@ -147,6 +147,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_docdir}/%{name}/ %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 4.8.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Thu Dec 29 2011 Christoph Wickert - 4.8.3-3 - Don't try to remove $HOME if it is an xdg-user-dir (bugzilla.xfce.org #8154) - xfrun4 is part of xfce4-appfinder in Fedora >= 17 From 1af09612a49dec56dbf1a27a87e6e94cb1909d5a Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 20 Jan 2012 15:00:43 -0700 Subject: [PATCH 20/23] Add fix for the migration perl script to generate correct desktop files. Fixes bug #770313 --- xfce-utils-4.8.3-46-migration-gnome.patch | 12 ++++++++++++ xfce-utils.spec | 7 +++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/xfce-utils-4.8.3-46-migration-gnome.patch b/xfce-utils-4.8.3-46-migration-gnome.patch index 80bd0ae..4fbad19 100644 --- a/xfce-utils-4.8.3-46-migration-gnome.patch +++ b/xfce-utils-4.8.3-46-migration-gnome.patch @@ -8,3 +8,15 @@ diff -Nur xfce-utils-4.8.3.orig/scripts/xfconf-migration-4.6.desktop.in xfce-uti +X-GNOME-Autostart-enabled=false +OnlyShowIn=XFCE; Categories=Utility; +diff -Nur xfce-utils-4.8.3.orig/scripts/xfconf-migration-4.6.pl.in xfce-utils-4.8.3/scripts/xfconf-migration-4.6.pl.in +--- xfce-utils-4.8.3.orig/scripts/xfconf-migration-4.6.pl.in 2011-09-22 13:38:05.000000000 -0600 ++++ xfce-utils-4.8.3/scripts/xfconf-migration-4.6.pl.in 2012-01-20 14:44:29.121871844 -0700 +@@ -127,7 +127,7 @@ + + open(DOUT, '>'.$autostart_file) and do { + print DOUT "[Desktop Entry]\n"; +- print DOUT "Hidden=true\n"; ++ print DOUT "Name=Xfce46Migration\nType=dummy\nHidden=true\n"; + close(DOUT); + } or warn("Unable to write local autostart file: $!"); + } diff --git a/xfce-utils.spec b/xfce-utils.spec index 32307d7..4490c8b 100644 --- a/xfce-utils.spec +++ b/xfce-utils.spec @@ -3,7 +3,7 @@ Name: xfce-utils Version: 4.8.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Utilities for the Xfce Desktop Environment Group: User Interface/Desktops @@ -16,7 +16,7 @@ Patch1: xfce-utils-4.4.3-xfterm4-bug.patch Patch2: xfce-utils-4.7.1-test-running-screensver.patch Patch3: xfce-utils-4.8.0-fix-desktop-categories.patch # Already upstream: http://git.xfce.org/xfce/xfce-utils/commit/?id=9b6d7d17b466d605e6cd3febd7291cc0f38c0336 -# Prevents gnome from running the 4.6 migration on gnome login. +# Prevents gnome from running the 4.6 migration on gnome login and fixes the .pl migration tool. Patch4: xfce-utils-4.8.3-46-migration-gnome.patch # taken from https://bugzilla.xfce.org/show_bug.cgi?id=8154 Patch5: xfce-utils-4.8.3-check_if_userdir_is_home.patch @@ -147,6 +147,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_docdir}/%{name}/ %changelog +* Fri Jan 20 2012 Kevin Fenzi 4.8.3-5 +- Add fix for the migration perl script to generate correct desktop files. Fixes bug #770313 + * Sat Jan 14 2012 Fedora Release Engineering - 4.8.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From c896edb8db211f0d949e57c5851ce945a4570261 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Fri, 24 Feb 2012 17:35:41 +0100 Subject: [PATCH 21/23] Remove menu entry for xfrun4 (#794890) --- xfce-utils.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xfce-utils.spec b/xfce-utils.spec index 4490c8b..f29ebb7 100644 --- a/xfce-utils.spec +++ b/xfce-utils.spec @@ -3,7 +3,7 @@ Name: xfce-utils Version: 4.8.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Utilities for the Xfce Desktop Environment Group: User Interface/Desktops @@ -91,6 +91,7 @@ mkdir -p %{buildroot}%{_datadir}/xfce4/doc/{ast,C,ca,da,es,fr,gl,id,it,ja,pt,tr, # xfrun4 is part of xfce4-appfinder Fedora > 17 %if 0%{?fedora} >= 17 rm -f %{buildroot}%{_bindir}/xfrun4 +rm -f %{buildroot}%{_datadir}/applications/xfrun4.desktop %endif @@ -147,6 +148,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_docdir}/%{name}/ %changelog +* Fri Feb 24 2012 Christoph Wickert - 4.8.3-6 +- Remove menu entry for xfrun4 (#794890) + * Fri Jan 20 2012 Kevin Fenzi 4.8.3-5 - Add fix for the migration perl script to generate correct desktop files. Fixes bug #770313 From 0a817db398bc33ade0dd69061e0c1cb1ce60c7ea Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 5 Apr 2012 15:07:34 -0600 Subject: [PATCH 22/23] Package is retired --- .gitignore | 6 - dead.package | 1 + sources | 1 - xfce-utils-4.4.3-xfterm4-bug.patch | 44 --- xfce-utils-4.7.1-pulseaudio.patch | 14 - ...-utils-4.7.1-test-running-screensver.patch | 14 - xfce-utils-4.7.3-pulseaudio.patch | 14 - xfce-utils-4.8.0-fix-desktop-categories.patch | 9 - xfce-utils-4.8.3-46-migration-gnome.patch | 22 -- ...utils-4.8.3-check_if_userdir_is_home.patch | 24 -- xfce-utils.spec | 354 ------------------ 11 files changed, 1 insertion(+), 502 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 sources delete mode 100644 xfce-utils-4.4.3-xfterm4-bug.patch delete mode 100644 xfce-utils-4.7.1-pulseaudio.patch delete mode 100644 xfce-utils-4.7.1-test-running-screensver.patch delete mode 100644 xfce-utils-4.7.3-pulseaudio.patch delete mode 100644 xfce-utils-4.8.0-fix-desktop-categories.patch delete mode 100644 xfce-utils-4.8.3-46-migration-gnome.patch delete mode 100644 xfce-utils-4.8.3-check_if_userdir_is_home.patch delete mode 100644 xfce-utils.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 368e0ca..0000000 --- a/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -xfce-utils-4.6.2.tar.bz2 -/xfce-utils-4.7.4.tar.bz2 -/xfce-utils-4.8.0.tar.bz2 -/xfce-utils-4.8.1.tar.bz2 -/xfce-utils-4.8.2.tar.bz2 -/xfce-utils-4.8.3.tar.bz2 diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..0f98991 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Package is retired diff --git a/sources b/sources deleted file mode 100644 index 5bbb701..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -03b5fba5f63f4f1a31cc7d3728f3c87e xfce-utils-4.8.3.tar.bz2 diff --git a/xfce-utils-4.4.3-xfterm4-bug.patch b/xfce-utils-4.4.3-xfterm4-bug.patch deleted file mode 100644 index 23de5b3..0000000 --- a/xfce-utils-4.4.3-xfterm4-bug.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- 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 diff --git a/xfce-utils-4.7.1-pulseaudio.patch b/xfce-utils-4.7.1-pulseaudio.patch deleted file mode 100644 index ba6bb13..0000000 --- a/xfce-utils-4.7.1-pulseaudio.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- xfce-utils-4.7.1.orig/scripts/xinitrc.in 2010-11-07 10:52:24.000000000 +0100 -+++ xfce-utils-4.7.1/scripts/xinitrc.in 2010-11-13 10:46:16.437804690 +0100 -@@ -9,6 +9,11 @@ - fi - fi - -+# Fedora 8 and later use pulseaudio, start it for sound. -+if test x"`which pulseaudio 2>/dev/null`" != x""; then -+ 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. diff --git a/xfce-utils-4.7.1-test-running-screensver.patch b/xfce-utils-4.7.1-test-running-screensver.patch deleted file mode 100644 index 1e6a9f9..0000000 --- a/xfce-utils-4.7.1-test-running-screensver.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- xfce-utils-4.7.1.orig/scripts/xflock4 2010-11-07 10:52:14.000000000 +0100 -+++ xfce-utils-4.7.1/scripts/xflock4 2010-11-13 11:19:27.326293458 +0100 -@@ -19,9 +19,9 @@ - # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - # - --if test x"`which xscreensaver-command 2>/dev/null`" != x""; then -+if ps ux | grep x[s]creensaver > /dev/null 2>&1; then - xscreensaver-command -lock --elif test x"`which gnome-screensaver-command 2>/dev/null`" != x""; then -+elif ps ux | grep gnome-[s]creensaver > /dev/null 2>&1; then - gnome-screensaver-command --lock - elif test x"`which slock 2>/dev/null`" != x""; then - slock diff --git a/xfce-utils-4.7.3-pulseaudio.patch b/xfce-utils-4.7.3-pulseaudio.patch deleted file mode 100644 index 690c408..0000000 --- a/xfce-utils-4.7.3-pulseaudio.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- xfce-utils-4.7.3.orig/scripts/xinitrc.in 2010-12-05 15:39:24.000000000 +0100 -+++ xfce-utils-4.7.3/scripts/xinitrc.in 2010-12-05 17:06:41.275733920 +0100 -@@ -9,6 +9,11 @@ - fi - fi - -+# Fedora 8 and later use pulseaudio, start it for sound. -+if test x"`which pulseaudio 2>/dev/null`" != x""; then -+ pulseaudio -D & -+fi -+ - # set $XDG_MENU_PREFIX to "xfce-" so that "xfce-applications.menu" is picked - # over "applications.menu" in all Xfce applications. - if test "x$XDG_MENU_PREFIX" = "x"; then diff --git a/xfce-utils-4.8.0-fix-desktop-categories.patch b/xfce-utils-4.8.0-fix-desktop-categories.patch deleted file mode 100644 index ef8a332..0000000 --- a/xfce-utils-4.8.0-fix-desktop-categories.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -Nur xfce-utils-4.8.0.orig/scripts/xfconf-migration-4.6.desktop.in xfce-utils-4.8.0/scripts/xfconf-migration-4.6.desktop.in ---- xfce-utils-4.8.0.orig/scripts/xfconf-migration-4.6.desktop.in 2011-01-16 09:02:27.000000000 -0700 -+++ xfce-utils-4.8.0/scripts/xfconf-migration-4.6.desktop.in 2011-01-16 18:30:44.704493015 -0700 -@@ -5,4 +5,4 @@ - Terminal=false - Type=Application - StartupNotify=false --Categories=Utility -+Categories=Utility; diff --git a/xfce-utils-4.8.3-46-migration-gnome.patch b/xfce-utils-4.8.3-46-migration-gnome.patch deleted file mode 100644 index 4fbad19..0000000 --- a/xfce-utils-4.8.3-46-migration-gnome.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -Nur xfce-utils-4.8.3.orig/scripts/xfconf-migration-4.6.desktop.in xfce-utils-4.8.3/scripts/xfconf-migration-4.6.desktop.in ---- xfce-utils-4.8.3.orig/scripts/xfconf-migration-4.6.desktop.in 2011-12-09 16:02:58.689214217 -0700 -+++ xfce-utils-4.8.3/scripts/xfconf-migration-4.6.desktop.in 2011-12-09 16:04:31.347779838 -0700 -@@ -5,4 +5,6 @@ - Terminal=false - Type=Application - StartupNotify=false -+X-GNOME-Autostart-enabled=false -+OnlyShowIn=XFCE; - Categories=Utility; -diff -Nur xfce-utils-4.8.3.orig/scripts/xfconf-migration-4.6.pl.in xfce-utils-4.8.3/scripts/xfconf-migration-4.6.pl.in ---- xfce-utils-4.8.3.orig/scripts/xfconf-migration-4.6.pl.in 2011-09-22 13:38:05.000000000 -0600 -+++ xfce-utils-4.8.3/scripts/xfconf-migration-4.6.pl.in 2012-01-20 14:44:29.121871844 -0700 -@@ -127,7 +127,7 @@ - - open(DOUT, '>'.$autostart_file) and do { - print DOUT "[Desktop Entry]\n"; -- print DOUT "Hidden=true\n"; -+ print DOUT "Name=Xfce46Migration\nType=dummy\nHidden=true\n"; - close(DOUT); - } or warn("Unable to write local autostart file: $!"); - } diff --git a/xfce-utils-4.8.3-check_if_userdir_is_home.patch b/xfce-utils-4.8.3-check_if_userdir_is_home.patch deleted file mode 100644 index 85702eb..0000000 --- a/xfce-utils-4.8.3-check_if_userdir_is_home.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/scripts/xinitrc.in.in b/scripts/xinitrc.in.in -index f582934..e63eac1 100755 ---- a/scripts/xinitrc.in.in -+++ b/scripts/xinitrc.in.in -@@ -54,7 +54,8 @@ if test -f "$XDG_CONFIG_HOME/user-dirs.dirs"; then - # a bit of user dir migration... - if test -d "$HOME/Desktop" -a ! -L "$HOME/Desktop" \ - -a "$XDG_DESKTOP_DIR" \ -- -a "$HOME/Desktop" != "$XDG_DESKTOP_DIR" -+ -a "$HOME/Desktop" != "$XDG_DESKTOP_DIR" \ -+ -a "$HOME" != "$XDG_DESKTOP_DIR" - then - echo "Migrating $HOME/Desktop to $XDG_DESKTOP_DIR..." - test -d "$XDG_DESKTOP_DIR" && rmdir "$XDG_DESKTOP_DIR" -@@ -63,7 +64,8 @@ if test -f "$XDG_CONFIG_HOME/user-dirs.dirs"; then - - if test -d "$HOME/Templates" -a ! -L "$HOME/Templates" \ - -a "$XDG_TEMPLATES_DIR" \ -- -a "$HOME/Templates" != "$XDG_TEMPLATES_DIR" -+ -a "$HOME/Templates" != "$XDG_TEMPLATES_DIR" \ -+ -a "$HOME" != "$XDG_TEMPLATES_DIR" - then - echo "Migrating $HOME/Templates to $XDG_TEMPLATES_DIR..." - test -d "$XDG_TEMPLATES_DIR" && rmdir "$XDG_TEMPLATES_DIR" diff --git a/xfce-utils.spec b/xfce-utils.spec deleted file mode 100644 index f29ebb7..0000000 --- a/xfce-utils.spec +++ /dev/null @@ -1,354 +0,0 @@ -%global xfceversion 4.8 -%global xsessiondir %{_datadir}/xsessions - -Name: xfce-utils -Version: 4.8.3 -Release: 6%{?dist} -Summary: Utilities for the Xfce Desktop Environment - -Group: User Interface/Desktops -License: GPLv2+ -URL: http://www.xfce.org/ -Source0: http://archive.xfce.org/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2 -Patch0: xfce-utils-4.7.3-pulseaudio.patch -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.7.1-test-running-screensver.patch -Patch3: xfce-utils-4.8.0-fix-desktop-categories.patch -# Already upstream: http://git.xfce.org/xfce/xfce-utils/commit/?id=9b6d7d17b466d605e6cd3febd7291cc0f38c0336 -# Prevents gnome from running the 4.6 migration on gnome login and fixes the .pl migration tool. -Patch4: xfce-utils-4.8.3-46-migration-gnome.patch -# taken from https://bugzilla.xfce.org/show_bug.cgi?id=8154 -Patch5: xfce-utils-4.8.3-check_if_userdir_is_home.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root - -BuildRequires: libxfce4ui-devel >= %{xfceversion} -BuildRequires: gettext -BuildRequires: desktop-file-utils -BuildRequires: dbus-devel -BuildRequires: dbus-glib-devel -BuildRequires: perl(XML::Parser) -BuildRequires: intltool -Requires: xfwm4 -Requires: xfdesktop -Requires: xfce4-doc -Requires: xfce4-settings -Requires: /usr/bin/id - - -%description -This package includes utilities for the Xfce Desktop Environment. - -%package -n xfce4-doc -Summary: Basic documentation for the Xfce Desktop Environment -Group: Documentation -BuildArch: noarch - -%description -n xfce4-doc -This package includes common docs for the Xfce Desktop Environment. - -%prep -%setup -q -%patch0 -p1 -b .pulseaudio -%patch1 -p1 -b .xfterm4-bug -%patch2 -p1 -b .gnome-screensaver -%patch3 -p1 -b .desktop-categories -%patch4 -p1 -b .46-migration-gnome -%patch5 -p1 -b .check_if_userdir_is_home - - -%build -%configure --disable-static - -make %{?_smp_mflags} - - -%install -rm -rf %{buildroot} - -make install DESTDIR=%{buildroot} INSTALL='install -p' -%find_lang %{name} - -desktop-file-install --vendor="" --delete-original \ - --add-category="Documentation" \ - --remove-category="X-Xfce-Toplevel" \ - --dir=%{buildroot}%{_datadir}/applications \ - %{buildroot}%{_datadir}/applications/xfce4-about.desktop - -desktop-file-install --vendor="" --delete-original \ - --add-category="Documentation" \ - --remove-category="X-Xfce-Toplevel" \ - --dir=%{buildroot}%{_datadir}/applications \ - %{buildroot}%{_datadir}/applications/xfhelp4.desktop - -desktop-file-validate %{buildroot}%{_datadir}/applications/xfrun4.desktop - -desktop-file-validate %{buildroot}%{_sysconfdir}/xdg/autostart/xfconf-migration-4.6.desktop - -# we need the doc package to own these -mkdir -p %{buildroot}%{_datadir}/xfce4/doc/{ast,C,ca,da,es,fr,gl,id,it,ja,pt,tr,zh_CN}/images - -# xfrun4 is part of xfce4-appfinder Fedora > 17 -%if 0%{?fedora} >= 17 -rm -f %{buildroot}%{_bindir}/xfrun4 -rm -f %{buildroot}%{_datadir}/applications/xfrun4.desktop -%endif - - -%clean -rm -rf %{buildroot} - - -%post -touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : - - -%postun -if [ $1 -eq 0 ] ; then - touch --no-create %{_datadir}/icons/hicolor &>/dev/null - gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -fi - - -%posttrans -gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - - -%files -f %{name}.lang -%defattr(-,root,root,-) -%doc README ChangeLog NEWS COPYING AUTHORS -%attr(0755,root,root) -%config(noreplace) %{_sysconfdir}/xdg/xfce4/xinitrc -%config(noreplace) %{_sysconfdir}/xdg/xfce4/Xft.xrdb -%config(noreplace) %{_sysconfdir}/xdg/autostart/xfconf-migration-4.6.desktop -%{_bindir}/startxfce4 -%{_bindir}/xfbrowser4 -%{_bindir}/xfce4-about -%{_bindir}/xflock4 -%{_bindir}/xfmountdev4 - -# xfrun4 is part of xfce4-appfinder Fedora > 17 -%if 0%{?fedora} < 17 -%{_bindir}/xfrun4 -%endif - -%{_bindir}/xfterm4 -%{_libdir}/xfce4/xfconf-migration/ -%{_datadir}/icons/hicolor/*/*/* -%{xsessiondir}/* -%{_datadir}/dbus-1/services/org.xfce.RunDialog.service -%{_datadir}/applications/*.desktop - -%files -n xfce4-doc -%defattr(-,root,root,-) -%{_bindir}/xfhelp4 -%dir %{_datadir}/xfce4/doc -%dir %{_datadir}/xfce4/doc/* -%dir %{_datadir}/xfce4/doc/*/images -%{_docdir}/%{name}/ - -%changelog -* Fri Feb 24 2012 Christoph Wickert - 4.8.3-6 -- Remove menu entry for xfrun4 (#794890) - -* Fri Jan 20 2012 Kevin Fenzi 4.8.3-5 -- Add fix for the migration perl script to generate correct desktop files. Fixes bug #770313 - -* Sat Jan 14 2012 Fedora Release Engineering - 4.8.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Thu Dec 29 2011 Christoph Wickert - 4.8.3-3 -- Don't try to remove $HOME if it is an xdg-user-dir (bugzilla.xfce.org #8154) -- xfrun4 is part of xfce4-appfinder in Fedora >= 17 - -* Fri Dec 09 2011 Kevin Fenzi - 4.8.3-2 -- Stop gnome from running 4.6 migration on gnome logins. Fixes bug #760621 - -* Fri Sep 23 2011 Kevin Fenzi - 4.8.3-1 -- Update to 4.8.3 - -* Sat Jun 18 2011 Christoph Wickert - 4.8.2-1 -- Update to 4.8.2 - -* Thu May 19 2011 Orion Poplawski - 4.8.1-3 -- Require xfce4-settings - -* Mon Feb 07 2011 Fedora Release Engineering - 4.8.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Sun Jan 30 2011 Kevin Fenzi - 4.8.1-1 -- Update to 4.8.1 - -* Sun Jan 16 2011 Kevin Fenzi - 4.8.0-1 -- Update to 4.8.0 - -* Sun Jan 02 2011 Christoph Wickert - 4.7.4-1 -- Update to 4.7.4 - -* Sun Dec 05 2010 Christoph Wickert - 4.7.3-1 -- Update to 4.7.3 - -* Fri Dec 03 2010 Christoph Wickert - 4.7.2-1 -- Update to 4.7.2 -- Update gtk-icon-cache scriptlets - -* Sat Nov 13 2010 Christoph Wickert - 4.7.1-1 -- Update to 4.7.1 - -* Sun Sep 05 2010 Christoph Wickert - 4.7.0-1 -- Update to 4.7.0 - -* Wed Jul 07 2010 Kevin Fenzi - 4.6.2-2 -- Add Copying file to docs in doc subpackage. - -* Fri May 21 2010 Kevin Fenzi - 4.6.2-1 -- Update to 4.6.2 - -* Mon Jul 27 2009 Fedora Release Engineering - 4.6.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Sun Apr 19 2009 Kevin Fenzi - 4.6.1-1 -- Update to 4.6.1 - -* Mon Mar 02 2009 Christoph Wickert - 4.6.0-2 -- Fix directory ownership problems -- Make separate xfce4-doc package - -* Thu Feb 26 2009 Kevin Fenzi - 4.6.0-1 -- Update to 4.6.0 -- Remove unneeded BuildRequires - -* Thu Feb 26 2009 Fedora Release Engineering - 4.5.99.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Mon Jan 26 2009 Kevin Fenzi - 4.5.99.1-1 -- Update to 4.5.99.1 - -* Tue Jan 13 2009 Kevin Fenzi - 4.5.93-1 -- Update to 4.5.93 - -* Sat Dec 27 2008 Kevin Fenzi - 4.5.92-1 -- Update to 4.5.92 - -* Mon Oct 27 2008 Christoph Wickert - 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 - 4.4.2-4 -- Rebuild for gcc43 - -* Mon Jan 14 2008 Kevin Fenzi - 4.4.2-3 -- Patch correct file - -* Wed Jan 02 2008 Kevin Fenzi - 4.4.2-2 -- Add patch to start pulseaudio if installed - -* Sun Nov 18 2007 Kevin Fenzi - 4.4.2-1 -- Update to 4.4.2 - -* Mon Aug 27 2007 Kevin Fenzi - 4.4.1-3 -- Update License tag - -* Mon Jul 30 2007 Kevin Fenzi - 4.4.1-2 -- Add dbus BuildRequires. Thanks to Andy Shevchenko (fixes #250067) - -* Wed Apr 11 2007 Kevin Fenzi - 4.4.1-1 -- Update to 4.4.1 - -* Tue Apr 3 2007 Kevin Fenzi - 4.4.0-2 -- Do not own %%{_sysconfdir}/xdg/xfce4 -- Do not ship the switchdesk config - -* Sun Jan 21 2007 Kevin Fenzi - 4.4.0-1 -- Update to 4.4.0 - -* Fri Nov 10 2006 Kevin Fenzi - 4.3.99.2-1 -- Update to 4.3.99.2 - -* Thu Oct 5 2006 Kevin Fenzi - 4.3.99.1-5 -- Fix defattr - -* Wed Oct 4 2006 Kevin Fenzi - 4.3.99.1-4 -- Bump release for devel checkin - -* Sun Sep 24 2006 Kevin Fenzi - 4.3.99.1-3 -- Don't own doc dirs (xfdesktop does) - -* Sun Sep 17 2006 Kevin Fenzi - 4.3.99.1-2 -- Don't own datadir/xfce4 (xfwm4 already does) - -* Sun Sep 3 2006 Kevin Fenzi - 4.3.99.1-1 -- Upgrade to 4.3.99.1 - -* Wed Jul 12 2006 Kevin Fenzi - 4.3.90.2-1 -- Update to 4.3.90.2 - -* Mon May 8 2006 Kevin Fenzi - 4.3.90.1-1 -- Update to 4.3.90.1 - -* Mon Nov 7 2005 Kevin Fenzi - 4.2.3-1.fc5 -- Update to 4.2.3 -- Added dist tag - -* Tue May 17 2005 Kevin Fenzi - 4.2.2-1.fc4 -- Update to 4.2.2 - -* Fri Mar 25 2005 Kevin Fenzi - 4.2.1-3.fc4 -- lowercase Release - -* Wed Mar 23 2005 Kevin Fenzi - 4.2.1-2.FC4 -- Removed unneeded la/a files - -* Tue Mar 15 2005 Kevin Fenzi - 4.2.1-1 -- Updated to 4.2.1 version - -* Tue Mar 8 2005 Kevin Fenzi - 4.2.0-3 -- Fixed case on Xfce - -* Sun Mar 6 2005 Kevin Fenzi - 4.2.0-2 -- Removed old misc patch - -* Thu Jan 27 2005 Than Ngo 4.2.0-1 -- 4.2.0 - -* Thu Dec 02 2004 Than Ngo 4.0.6-3 -- permission fix #141597 - -* Mon Nov 22 2004 Than Ngo 4.0.6-2 -- add session desktop file from KDE, better translations -- improve xfterm4 #139183 - -* Mon Jul 19 2004 Than Ngo 4.0.6-1 -- update to 4.0.6 -- use %%find_lang macros, bug #124950 -- fix component deps, bug #125744 -- don't run xmodmap twice, bug #115500 - -* Tue Jun 15 2004 Elliot Lee -- rebuilt - -* Thu Apr 15 2004 Than Ngo 4.0.5-1 -- update to 4.0.5 - -* Tue Mar 02 2004 Elliot Lee -- rebuilt - -* Fri Feb 13 2004 Elliot Lee -- rebuilt - -* Tue Jan 27 2004 Than Ngo 4.0.3-2 -- fixed dependant libraries check on x86_64 - -* Tue Jan 13 2004 Than Ngo 4.0.3-1 -- 4.0.3 release - -* Thu Dec 25 2003 Than Ngo 4.0.2-1 -- 4.0.2 release - -* Tue Dec 16 2003 Than Ngo 4.0.1-1 -- initial build - From e198006f435f451c9838500eb8bc8908d712d042 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 5 Apr 2012 15:08:07 -0600 Subject: [PATCH 23/23] Clarify reason for retiring. --- dead.package | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dead.package b/dead.package index 0f98991..e159ba9 100644 --- a/dead.package +++ b/dead.package @@ -1 +1,3 @@ Package is retired + +Functionality has been absorbed by serveral other packages in Xfce 4.10