[xfce-utils] - Update to 4.7.4
Christoph Wickert
cwickert at fedoraproject.org
Sat Jan 8 22:36:21 UTC 2011
commit 6a29746c1ae79ac9632ac567ae29c9b410619a28
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date: Sat Jan 8 23:36:06 2011 +0100
- 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 ++
xfce-utils-4.7.1-test-running-screensver.patch | 14 ++
xfce-utils-4.7.3-pulseaudio.patch | 14 ++
xfce-utils.spec | 165 +++++++++++++----------
xfce4.desktop | 49 -------
10 files changed, 137 insertions(+), 217 deletions(-)
---
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.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
-
-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
+%global xfceversion 4.7
+%global xsessiondir %{_datadir}/xsessions
+
+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 <cwickert at fedoraproject.org> - 4.7.4-1
+- Update to 4.7.4
+
+* Sun Dec 05 2010 Christoph Wickert <cwickert at fedoraproject.org> - 4.7.3-1
+- Update to 4.7.3
+
+* Fri Dec 03 2010 Christoph Wickert <cwickert at fedoraproject.org> - 4.7.2-1
+- Update to 4.7.2
+- Update gtk-icon-cache scriptlets
+
+* Sat Nov 13 2010 Christoph Wickert <cwickert at fedoraproject.org> - 4.7.1-1
+- Update to 4.7.1
+
+* Sun Sep 05 2010 Christoph Wickert <cwickert at fedoraproject.org> - 4.7.0-1
+- Update to 4.7.0
+
* Wed Jul 07 2010 Kevin Fenzi <kevin at tummy.com> - 4.6.2-2
- Add Copying file to docs in doc subpackage.
More information about the scm-commits
mailing list