Compare commits

..

3 commits

Author SHA1 Message Date
Fedora Release Engineering
2bff6bc899 dist-git conversion 2010-07-29 15:42:32 +00:00
e0ca99c8f5 Update to 4.6.2 2010-06-07 02:34:58 +00:00
Jesse Keating
01ea54fdf7 Initialize branch F-13 for xfce-utils 2010-02-17 03:29:39 +00:00
8 changed files with 427 additions and 3 deletions

1
.gitignore vendored Normal file
View file

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

View file

@ -1,3 +0,0 @@
Package is retired
Functionality has been absorbed by serveral other packages in Xfce 4.10

1
sources Normal file
View file

@ -0,0 +1 @@
5d23407700d7e8c9751e17a5bc955109 xfce-utils-4.6.2.tar.bz2

View file

@ -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 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.

View file

@ -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

View file

@ -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

281
xfce-utils.spec Normal file
View file

@ -0,0 +1,281 @@
%define xsessiondir %{_datadir}/xsessions
Summary: Utilities for the Xfce Desktop Environment
Name: xfce-utils
Version: 4.6.2
Release: 1%{?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
# 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: 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
%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
#Requires: %{name} = %{version}-%{release}
%description -n xfce4-doc
This package includes common docs 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 --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}/
%find_lang %{name}
# 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)
%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,-)
%{_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
* Fri May 21 2010 Kevin Fenzi <kevin@tummy.com> - 4.6.2-1
- Update to 4.6.2
* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.6.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
* Sun Apr 19 2009 Kevin Fenzi <kevin@tummy.com> - 4.6.1-1
- Update to 4.6.1
* Mon Mar 02 2009 Christoph Wickert <cwickert@fedoraproject.org> - 4.6.0-2
- Fix directory ownership problems
- Make separate xfce4-doc package
* Thu Feb 26 2009 Kevin Fenzi <kevin@tummy.com> - 4.6.0-1
- Update to 4.6.0
- Remove unneeded BuildRequires
* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@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@tummy.com> - 4.5.99.1-1
- Update to 4.5.99.1
* Tue Jan 13 2009 Kevin Fenzi <kevin@tummy.com> - 4.5.93-1
- Update to 4.5.93
* Sat Dec 27 2008 Kevin Fenzi <kevin@tummy.com> - 4.5.92-1
- Update to 4.5.92
* 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
* 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
* Mon Jul 30 2007 Kevin Fenzi <kevin@tummy.com> - 4.4.1-2
- Add dbus BuildRequires. Thanks to Andy Shevchenko (fixes #250067)
* Wed Apr 11 2007 Kevin Fenzi <kevin@tummy.com> - 4.4.1-1
- Update to 4.4.1
* Tue Apr 3 2007 Kevin Fenzi <kevin@tummy.com> - 4.4.0-2
- Do not own %%{_sysconfdir}/xdg/xfce4
- Do not ship the switchdesk config
* Sun Jan 21 2007 Kevin Fenzi <kevin@tummy.com> - 4.4.0-1
- Update to 4.4.0
* Fri Nov 10 2006 Kevin Fenzi <kevin@tummy.com> - 4.3.99.2-1
- Update to 4.3.99.2
* Thu Oct 5 2006 Kevin Fenzi <kevin@tummy.com> - 4.3.99.1-5
- Fix defattr
* Wed Oct 4 2006 Kevin Fenzi <kevin@tummy.com> - 4.3.99.1-4
- Bump release for devel checkin
* Sun Sep 24 2006 Kevin Fenzi <kevin@tummy.com> - 4.3.99.1-3
- Don't own doc dirs (xfdesktop does)
* Sun Sep 17 2006 Kevin Fenzi <kevin@tummy.com> - 4.3.99.1-2
- Don't own datadir/xfce4 (xfwm4 already does)
* Sun Sep 3 2006 Kevin Fenzi <kevin@tummy.com> - 4.3.99.1-1
- Upgrade to 4.3.99.1
* Wed Jul 12 2006 Kevin Fenzi <kevin@tummy.com> - 4.3.90.2-1
- Update to 4.3.90.2
* Mon May 8 2006 Kevin Fenzi <kevin@tummy.com> - 4.3.90.1-1
- Update to 4.3.90.1
* Mon Nov 7 2005 Kevin Fenzi <kevin@tummy.com> - 4.2.3-1.fc5
- Update to 4.2.3
- Added dist tag
* Tue May 17 2005 Kevin Fenzi <kevin@tummy.com> - 4.2.2-1.fc4
- Update to 4.2.2
* Fri Mar 25 2005 Kevin Fenzi <kevin@tummy.com> - 4.2.1-3.fc4
- lowercase Release
* Wed Mar 23 2005 Kevin Fenzi <kevin@tummy.com> - 4.2.1-2.FC4
- Removed unneeded la/a files
* Tue Mar 15 2005 Kevin Fenzi <kevin@tummy.com> - 4.2.1-1
- Updated to 4.2.1 version
* Tue Mar 8 2005 Kevin Fenzi <kevin@tummy.com> - 4.2.0-3
- Fixed case on Xfce
* Sun Mar 6 2005 Kevin Fenzi <kevin@tummy.com> - 4.2.0-2
- Removed old misc patch
* Thu Jan 27 2005 Than Ngo <than@redhat.com> 4.2.0-1
- 4.2.0
* Thu Dec 02 2004 Than Ngo <than@redhat.com> 4.0.6-3
- permission fix #141597
* Mon Nov 22 2004 Than Ngo <than@redhat.com> 4.0.6-2
- add session desktop file from KDE, better translations
- improve xfterm4 #139183
* Mon Jul 19 2004 Than Ngo <than@redhat.com> 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 <sopwith@redhat.com>
- rebuilt
* Thu Apr 15 2004 Than Ngo <than@redhat.com> 4.0.5-1
- update to 4.0.5
* Tue Mar 02 2004 Elliot Lee <sopwith@redhat.com>
- rebuilt
* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
- rebuilt
* Tue Jan 27 2004 Than Ngo <than@redhat.com> 4.0.3-2
- fixed dependant libraries check on x86_64
* Tue Jan 13 2004 Than Ngo <than@redhat.com> 4.0.3-1
- 4.0.3 release
* Thu Dec 25 2003 Than Ngo <than@redhat.com> 4.0.2-1
- 4.0.2 release
* Tue Dec 16 2003 Than Ngo <than@redhat.com> 4.0.1-1
- initial build

49
xfce4.desktop Normal file
View file

@ -0,0 +1,49 @@
[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]= 4CDE