From 319853717a1d88ca045e7db78bde1523d29cb456f32159f65d104b1c0a5a7ad4 Mon Sep 17 00:00:00 2001 From: Guido Berhoerster Date: Mon, 7 May 2012 12:25:17 +0000 Subject: [PATCH 1/2] - bring back xfhelp4 since it is still needed until all applications have been ported to xfce_dialog_show_help() or an alternative mechanism OBS-URL: https://build.opensuse.org/package/show/X11:xfce/libxfce4ui?expand=0&rev=37 --- libxfce4ui.changes | 7 +++++ libxfce4ui.spec | 6 ++++ xfhelp4.sh | 75 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 88 insertions(+) create mode 100644 xfhelp4.sh diff --git a/libxfce4ui.changes b/libxfce4ui.changes index 0044ec3..509ce4e 100644 --- a/libxfce4ui.changes +++ b/libxfce4ui.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon May 7 12:20:03 UTC 2012 - gber@opensuse.org + +- bring back xfhelp4 since it is still needed until all + applications have been ported to xfce_dialog_show_help() or an + alternative mechanism + ------------------------------------------------------------------- Thu May 3 11:50:35 UTC 2012 - gber@opensuse.org diff --git a/libxfce4ui.spec b/libxfce4ui.spec index 6babe4b..6eba3f9 100644 --- a/libxfce4ui.spec +++ b/libxfce4ui.spec @@ -26,6 +26,9 @@ License: LGPL-2.1+ Group: System/Libraries Url: http://www.xfce.org/ Source0: http://archive.xfce.org/src/xfce/libxfce4ui/4.10/%{name}-%{version}.tar.bz2 +# needed until all applications have been ported to xfce_dialog_show_help() or +# an alternative mechanism +Source1: xfhelp4.sh BuildRequires: gtk-doc BuildRequires: intltool BuildRequires: update-desktop-files @@ -141,6 +144,8 @@ make %{?_smp_mflags} V=1 %install %make_install +install -D -p -m 755 %{SOURCE1} %{buildroot}%{_bindir}/xfhelp4 + rm -f %{buildroot}%{_libdir}/*.la rm -f %{buildroot}%{_libdir}/libglade/2.0/*.la rm -f %{buildroot}%{_libdir}/glade3/modules/*.la @@ -194,6 +199,7 @@ rm -rf %{buildroot} %files tools %defattr(-, root, root) +%{_bindir}/xfhelp4 %{_bindir}/xfce4-about %{_datadir}/applications/xfce4-about.desktop %{_datadir}/icons/hicolor/48x48/apps/xfce4-logo.png diff --git a/xfhelp4.sh b/xfhelp4.sh new file mode 100644 index 0000000..53f3acb --- /dev/null +++ b/xfhelp4.sh @@ -0,0 +1,75 @@ +#!/bin/sh +# +# xfce +# +# Copyright (C) 1999 Olivier Fourdan (fourdan@xfce.org) +# Copyright (C) 2003 Jasper Huijsmans (jasper@xfce.org) +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# + +HELP_DIR="/usr/share/xfce4" + +if [ -n "$1" ]; then + HELP_FILE= + MODULE="${1%.html}" + case $1 in + *.html) + HELP_FILE="$1" + ;; + esac +else + exit 1 +fi + +# Check for translated documentation +if [ -n "$LC_ALL" ] ; then + LC=$LC_ALL +elif [ -n "$LANG" ] ; then + LC=$LANG +else + LC="C" +fi + +LC_CLEAN="${LC%_*}" + +if [ -r "$HELP_DIR/$MODULE/html/$LC/index.html" ] +then + URL="$HELP_DIR/$MODULE/html/$LC/index.html" +elif [ -r "$HELP_DIR/$MODULE/html/$LC_CLEAN/index.html" ] +then + URL="$HELP_DIR/$MODULE/html/$LC_CLEAN/index.html" +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 + +exo-open "${URL}" From a617f4835ff86edf7e84cb76ad99af7a647ae9631907afd45d25eb403ea1e810 Mon Sep 17 00:00:00 2001 From: Guido Berhoerster Date: Wed, 9 May 2012 08:05:26 +0000 Subject: [PATCH 2/2] - add versioned build dependency OBS-URL: https://build.opensuse.org/package/show/X11:xfce/libxfce4ui?expand=0&rev=39 --- libxfce4ui.changes | 5 +++++ libxfce4ui.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libxfce4ui.changes b/libxfce4ui.changes index 509ce4e..fbac2e9 100644 --- a/libxfce4ui.changes +++ b/libxfce4ui.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed May 9 08:05:44 UTC 2012 - gber@opensuse.org + +- add versioned build dependency + ------------------------------------------------------------------- Mon May 7 12:20:03 UTC 2012 - gber@opensuse.org diff --git a/libxfce4ui.spec b/libxfce4ui.spec index 6eba3f9..95ad400 100644 --- a/libxfce4ui.spec +++ b/libxfce4ui.spec @@ -36,7 +36,7 @@ BuildRequires: pkgconfig(gladeui-1.0) BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(libstartup-notification-1.0) -BuildRequires: pkgconfig(libxfce4util-1.0) +BuildRequires: pkgconfig(libxfce4util-1.0) >= 4.9.0 BuildRequires: pkgconfig(libxfconf-0) BuildRequires: pkgconfig(sm) BuildRoot: %{_tmppath}/%{name}-%{version}-build