Compare commits
8 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e198006f43 | ||
|
|
0a817db398 | ||
|
|
c896edb8db | ||
|
|
1af09612a4 | ||
|
|
fdb29cb8db | ||
|
|
e470067e70 | ||
|
|
d1e16e47cf | ||
|
|
fe03181b17 |
9 changed files with 3 additions and 422 deletions
6
.gitignore
vendored
6
.gitignore
vendored
|
|
@ -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
|
||||
3
dead.package
Normal file
3
dead.package
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
Package is retired
|
||||
|
||||
Functionality has been absorbed by serveral other packages in Xfce 4.10
|
||||
1
sources
1
sources
|
|
@ -1 +0,0 @@
|
|||
03b5fba5f63f4f1a31cc7d3728f3c87e xfce-utils-4.8.3.tar.bz2
|
||||
|
|
@ -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
|
||||
|
|
@ -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.
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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;
|
||||
320
xfce-utils.spec
320
xfce-utils.spec
|
|
@ -1,320 +0,0 @@
|
|||
%global xfceversion 4.8
|
||||
%global xsessiondir %{_datadir}/xsessions
|
||||
|
||||
Name: xfce-utils
|
||||
Version: 4.8.3
|
||||
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
|
||||
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}
|
||||
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
|
||||
|
||||
|
||||
%build
|
||||
%configure --disable-static
|
||||
|
||||
make %{?_smp_mflags}
|
||||
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
make install DESTDIR=$RPM_BUILD_ROOT 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
|
||||
|
||||
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
|
||||
|
||||
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/{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 &>/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
|
||||
%{_bindir}/xfrun4
|
||||
%{_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 Sep 23 2011 Kevin Fenzi <kevin@scrye.com> - 4.8.3-1
|
||||
- Update to 4.8.3
|
||||
|
||||
* Sat Jun 18 2011 Christoph Wickert <cwickert@fedoraproject.org> - 4.8.2-1
|
||||
- Update to 4.8.2
|
||||
|
||||
* Thu May 19 2011 Orion Poplawski <orion@cora.nwra.com> - 4.8.1-3
|
||||
- Require xfce4-settings
|
||||
|
||||
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.8.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
* Sun Jan 30 2011 Kevin Fenzi <kevin@tummy.com> - 4.8.1-1
|
||||
- Update to 4.8.1
|
||||
|
||||
* Sun Jan 16 2011 Kevin Fenzi <kevin@tummy.com> - 4.8.0-1
|
||||
- Update to 4.8.0
|
||||
|
||||
* Sun Jan 02 2011 Christoph Wickert <cwickert@fedoraproject.org> - 4.7.4-1
|
||||
- Update to 4.7.4
|
||||
|
||||
* Sun Dec 05 2010 Christoph Wickert <cwickert@fedoraproject.org> - 4.7.3-1
|
||||
- Update to 4.7.3
|
||||
|
||||
* Fri Dec 03 2010 Christoph Wickert <cwickert@fedoraproject.org> - 4.7.2-1
|
||||
- Update to 4.7.2
|
||||
- Update gtk-icon-cache scriptlets
|
||||
|
||||
* Sat Nov 13 2010 Christoph Wickert <cwickert@fedoraproject.org> - 4.7.1-1
|
||||
- Update to 4.7.1
|
||||
|
||||
* Sun Sep 05 2010 Christoph Wickert <cwickert@fedoraproject.org> - 4.7.0-1
|
||||
- Update to 4.7.0
|
||||
|
||||
* Wed Jul 07 2010 Kevin Fenzi <kevin@tummy.com> - 4.6.2-2
|
||||
- Add Copying file to docs in doc subpackage.
|
||||
|
||||
* 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
|
||||
|
||||
Reference in a new issue