Hello community,
here is the log from the commit of package xfce-utils for openSUSE:Factory
checked in at 2011-10-25 17:20:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xfce-utils (Old)
and /work/SRC/openSUSE:Factory/.xfce-utils.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xfce-utils", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/xfce-utils/xfce-utils.changes 2011-09-26
10:21:32.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xfce-utils.new/xfce-utils.changes
2011-10-28 15:29:05.000000000 +0200
@@ -1,0 +2,18 @@
+Sun Oct 23 11:19:08 UTC 2011 - g...@opensuse.org
+
+- added xfce-utils-adapt-session-script.patch to adapt the upstream
+ session script to openSUSE, SSH-/GPG-agents are already started
+ by /etc/X11/xdm/sys.xsession and xdg-user-dirs-update is already
+ called by /etc/X11/xinit/xinitrc.d/xdg-user-dirs.sh
+
+-------------------------------------------------------------------
+Thu Oct 20 18:32:20 UTC 2011 - g...@opensuse.org
+
+- install HTML documentation under /usr/share/xfce4/xfce-utils/html
+- install helper script under %{_libexecdir} instead of %{_libdir}
+- disable fdupes temporarily in order to work around bnc#705989
+- added xfce-utils-4.8.3-fix-xfhelp4-invocation.patch in oder to
+ fix the invocation of xfhelp4 with a HTML file commonly used by
+ Xfce components
+
+-------------------------------------------------------------------
New:
----
xfce-utils-4.8.3-fix-xfhelp4-invocation.patch
xfce-utils-adapt-session-script.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xfce-utils.spec ++++++
--- /var/tmp/diff_new_pack.TbHVQC/_old 2011-10-28 15:29:07.000000000 +0200
+++ /var/tmp/diff_new_pack.TbHVQC/_new 2011-10-28 15:29:07.000000000 +0200
@@ -27,6 +27,10 @@
Source: xfce-utils-%{version}.tar.bz2
Source1: xflock4.sh
Source100: %{name}-rpmlintrc
+# PATCH-FIX-UPSTREAM xfce-utils-4.8.3-fix-xfhelp4-invocation.patch
g...@opensuse.org -- Fix the invocation of xfhelp4 with a HTML file commonly
used by Xfce components
+Patch0: xfce-utils-4.8.3-fix-xfhelp4-invocation.patch
+# PATCH-FIX-OPENSUSE xfce-utils-adapt-session-script.patch g...@opensuse.org
-- Adapt upstream sessions script to openSUSE
+Patch1: xfce-utils-adapt-session-script.patch
BuildRequires: fdupes
BuildRequires: intltool
BuildRequires: pkgconfig(gtk+-2.0)
@@ -61,18 +65,19 @@
%lang_package
%prep
-%setup -q -n xfce-utils-%{version}
+%setup -q
+%patch0 -p1
+%patch1 -p1
%build
%configure \
- --docdir=%{_defaultdocdir}/%{name} \
+ --docdir=%{_datadir}/xfce4/xfce-utils \
+ --with-helper-path-prefix=%{_libexecdir} \
--with-vendor-info=openSUSE
make V=1 %{?_smp_mflags}
%install
%make_install
-install -p -m 644 ChangeLog README COPYING \
- %{buildroot}%{_defaultdocdir}/%{name}
install -p -m 755 %{SOURCE1} %{buildroot}%{_bindir}/xflock4
%suse_update_desktop_file xfce4-about -r X-XFCE X-Xfce-Toplevel
%suse_update_desktop_file xfrun4 -r X-XFCE X-Xfce-Toplevel
@@ -81,7 +86,8 @@
chmod +x %{buildroot}%{_sysconfdir}/xdg/xfce4/xinitrc
rm -rf %{buildroot}%{_datadir}/locale/{ast,kk,tl_PH,ur_PK}
%find_lang xfce-utils
-%fdupes %{buildroot}%{_datadir}
+# temporarily disabled due to bnc#705989
+#%%fdupes %{buildroot}%{_datadir}
%clean
rm -rf %{buildroot}
@@ -99,6 +105,7 @@
%files
%defattr(-,root,root)
+%doc ChangeLog README COPYING
%{_bindir}/startxfce4
%{_bindir}/xfbrowser4
%{_bindir}/xfce4-about
@@ -107,10 +114,9 @@
%{_bindir}/xfmountdev4
%{_bindir}/xfrun4
%{_bindir}/xfterm4
-# should be libexecdir, upstream uses libdir
-%dir %{_libdir}/xfce4
-%dir %{_libdir}/xfce4/xfconf-migration
-%{_libdir}/xfce4/xfconf-migration/xfconf-migration-4.6.pl
+%dir %{_libexecdir}/xfce4
+%dir %{_libexecdir}/xfce4/xfconf-migration
+%{_libexecdir}/xfce4/xfconf-migration/xfconf-migration-4.6.pl
%{_datadir}/applications/*.desktop
%{_datadir}/dbus-1/services/org.xfce.RunDialog.service
%{_datadir}/icons/hicolor/48x48/apps/xfce4-logo.png
@@ -121,7 +127,9 @@
%files doc
%defattr(-,root,root)
-%doc %{_defaultdocdir}/%{name}
+%dir %{_datadir}/xfce4
+%dir %{_datadir}/xfce4/xfce-utils
+%doc %{_datadir}/xfce4/xfce-utils/html/
%files lang -f %{name}.lang
++++++ xfce-utils-4.8.3-fix-xfhelp4-invocation.patch ++++++
Index: xfce-utils-4.8.3/scripts/xfhelp4.in
===================================================================
--- xfce-utils-4.8.3.orig/scripts/xfhelp4.in
+++ xfce-utils-4.8.3/scripts/xfhelp4.in
@@ -22,8 +22,14 @@
HELP_DIR="@_docdir_@"
-if [ ! x"$1" = x"" ]; then
+if [ -n "$1" ]; then
+ HELP_FILE=
MODULE="${1%.html}"
+ case $1 in
+ *.html)
+ HELP_FILE="$1"
+ ;;
+ esac
else
MODULE="xfce-utils"
fi
@@ -37,7 +43,7 @@ else
LC="C"
fi
-LC_CLEAN="`echo $LC | sed 's/\(..\)_.*/\1/'`"
+LC_CLEAN="${LC%_*}"
if [ -r "$HELP_DIR/$MODULE/html/$LC/index.html" ]
then
@@ -48,8 +54,22 @@ then
elif [ -r "$HELP_DIR/$MODULE/html/C/index.html" ]
then
URL="$HELP_DIR/$MODULE/html/C/index.html"
+elif [ -n "$HELP_FILE" ]
+then
+ if [ -r "$HELP_DIR/$MODULE/html/$LC/$HELP_FILE" ]
+ then
+ URL="$HELP_DIR/$MODULE/html/$LC/$HELP_FILE"
+ elif [ -r "$HELP_DIR/$MODULE/html/$LC_CLEAN/$HELP_FILE" ]
+ then
+ URL="$HELP_DIR/$MODULE/html/$LC_CLEAN/$HELP_FILE"
+ elif [ -r "$HELP_DIR/$MODULE/html/C/$HELP_FILE" ]
+ then
+ URL="$HELP_DIR/$MODULE/html/C/$HELP_FILE"
+ else
+ URL="$HELP_DIR/xfce-utils/html/C/index.html"
+ fi
else
URL="$HELP_DIR/xfce-utils/html/C/index.html"
fi
-xfbrowser4 $URL
+xfbrowser4 "${URL}"
++++++ xfce-utils-adapt-session-script.patch ++++++
Index: xfce-utils-4.8.3/scripts/xinitrc.in.in
===================================================================
--- xfce-utils-4.8.3.orig/scripts/xinitrc.in.in
+++ xfce-utils-4.8.3/scripts/xinitrc.in.in
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# fix broken $UID on some system...
if test "x$UID" = "x"; then
@@ -38,13 +38,6 @@ if test "x$XDG_CACHE_HOME" = "x" ; then
fi
[ -d "$XDG_CACHE_HOME" ] || mkdir "$XDG_CACHE_HOME"
-
-# set up XDG user directores. see
-# http://freedesktop.org/wiki/Software/xdg-user-dirs
-if which xdg-user-dirs-update >/dev/null 2>&1; then
- xdg-user-dirs-update
-fi
-
if test -f "$XDG_CONFIG_HOME/user-dirs.dirs"; then
. "$XDG_CONFIG_HOME/user-dirs.dirs"
# i'm deliberately not 'export'-ing the XDG_ vars, because you shouldn't
@@ -127,61 +120,6 @@ if test x"$DBUS_SESSION_BUS_ADDRESS" = x
fi
fi
-# launch gpg-agent or ssh-agent if enabled.
-ssh_agent_enabled=`xfconf-query -c xfce4-session -p /startup/ssh-agent/enabled
2> /dev/null`
-if test "$ssh_agent_enabled" != "false"; then
- # if the user has pam_ssh installed, it will start ssh-agent for us, but
- # of course won't start gpg-agent. so, if ssh-agent is already running,
- # but we want gpg-agent (and that's not running yet) start gpg-agent
- # without ssh support
-
- ssh_agent_type=`xfconf-query -c xfce4-session -p /startup/ssh-agent/type
2> /dev/null`
- if test -z "$ssh_agent_type"; then
- if which gpg-agent >/dev/null 2>&1; then
- ssh_agent_type=gpg-agent
- else
- ssh_agent_type=ssh-agent
- fi
- fi
-
- # ignore stale ssh-agents
- if test "$SSH_AGENT_PID"; then
- if ! kill -0 $SSH_AGENT_PID; then
- unset SSH_AGENT_PID
- unset SSH_AUTH_SOCK
- fi
- fi
-
- case "$ssh_agent_type" in
- gpg-agent)
- if test -z "$SSH_AGENT_PID"; then
- eval `gpg-agent --daemon --enable-ssh-support --write-env-file
$XDG_CACHE_HOME/gpg-agent-info`
- ssh_agent_kill_cmd="kill -INT $SSH_AGENT_PID; rm -f
$XDG_CACHE_HOME/gpg-agent-info"
- elif test -z "$GPG_AGENT_INFO"; then
- echo "ssh-agent is already running; starting gpg-agent without
ssh support"
- eval `gpg-agent --daemon --write-env-file
$XDG_CACHE_HOME/gpg-agent-info`
- ssh_agent_kill_cmd="pkill -INT ^gpg-agent\$; rm -f
$XDG_CACHE_HOME/gpg-agent-info"
- else
- echo "gpg-agent is already running"
- fi
- ;;
-
- ssh-agent)
- if test -z "$SSH_AGENT_PID"; then
- eval `ssh-agent -s`
- ssh_agent_kill_cmd="ssh-agent -s -k"
- else
- echo "ssh-agent is already running"
- fi
- ;;
-
- *)
- echo "Unrecognized agent type '$ssh_agent_type'" >&2
- ;;
- esac
-fi
-
-
# launch a screensaver if enabled. do not launch if we're root or if
# we're in a VNC session.
screensaver_enabled=`xfconf-query -c xfce4-session -p
/startup/screensaver/enabled 2> /dev/null`
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
