Hello community, here is the log from the commit of package susehelp for openSUSE:Factory checked in at 2012-08-04 13:33:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/susehelp (Old) and /work/SRC/openSUSE:Factory/.susehelp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "susehelp", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/susehelp/susehelp.changes 2011-09-23 12:47:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.susehelp.new/susehelp.changes 2012-08-04 13:33:15.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Jul 20 21:56:22 UTC 2012 - [email protected] + +- Add susehelp-ghelp-for-yelp.patch: Do not replace ghelp:// URIs + with help:// when running a gnome-desktop / using yelp. + Yelp does not understand help:// URIs (bnc#771530). + +------------------------------------------------------------------- New: ---- susehelp-ghelp-for-yelp.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ susehelp.spec ++++++ --- /var/tmp/diff_new_pack.fEI3Xc/_old 2012-08-04 13:33:16.000000000 +0200 +++ /var/tmp/diff_new_pack.fEI3Xc/_new 2012-08-04 13:33:16.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package susehelp (Version 2009.10.06) +# spec file for package susehelp # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,75 +15,84 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: susehelp -BuildRequires: apache2-devel libapr-util1-devel pcre-devel perl-XML-Parser -License: GPL-2.0+ -Group: Documentation/SUSE -Provides: manhtml susehilf dochost -Obsoletes: susehilf dochost -Requires: susehelp_lang recode wget info2html +BuildRequires: apache2-devel +BuildRequires: libapr-util1-devel +BuildRequires: pcre-devel +BuildRequires: perl-XML-Parser +Provides: dochost +Provides: manhtml +Provides: susehilf +Obsoletes: dochost +Obsoletes: susehilf +Requires: info2html +Requires: recode +Requires: susehelp_lang +Requires: wget Suggests: htdig PreReq: %fillup_prereq -AutoReqProv: on Version: 2009.10.06 -Release: 1 +Release: 0 Summary: SuSE Help-System (base) +License: GPL-2.0+ +Group: Documentation/SUSE Source: %{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM susehelp-ghelp-for-yelp.patch bnc#771530 [email protected] -- Do not mingle ghelp:// URIs to help:// when using yelp. +Patch0: susehelp-ghelp-for-yelp.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build %package -n susehelp_en -License: GPL-2.0+ Requires: susehelp Summary: SuSE Help System (English) Group: Documentation/SUSE -Provides: susehelp_lang locale(susehelp:en) +Provides: susehelp_lang +Provides: locale(susehelp:en) %package -n susehelp_de -License: GPL-2.0+ Requires: susehelp Summary: SuSE Help System (German) Group: Documentation/SUSE -Provides: susehelp_lang locale(susehelp:de) +Provides: susehelp_lang +Provides: locale(susehelp:de) %package -n susehelp_fr -License: GPL-2.0+ Requires: susehelp Summary: SuSE Help-System (French) Group: Documentation/SUSE -Provides: susehelp_lang locale(susehelp:fr) +Provides: susehelp_lang +Provides: locale(susehelp:fr) %package -n susehelp_es -License: GPL-2.0+ Requires: susehelp Summary: SuSE Help System (Spanish) Group: Documentation/SUSE -Provides: susehelp_lang locale(susehelp:es) +Provides: susehelp_lang +Provides: locale(susehelp:es) %package -n susehelp_it -License: GPL-2.0+ Requires: susehelp Summary: SuSE Help System (Italian) Group: Documentation/SUSE -Provides: susehelp_lang locale(susehelp:it) +Provides: susehelp_lang +Provides: locale(susehelp:it) %package -n susehelp_cz -License: GPL-2.0+ Requires: susehelp Summary: SuSE Help System (Czech) Group: Documentation/SUSE -Provides: susehelp_lang susehelp_cs locale(susehelp:cs) +Provides: susehelp_cs +Provides: susehelp_lang +Provides: locale(susehelp:cs) Obsoletes: susehelp_cs %package -n susehelp_hu -License: GPL-2.0+ Requires: susehelp Summary: SuSE Help System (Hungarian) Group: Documentation/SUSE -Provides: susehelp_lang locale(susehelp:hu) +Provides: susehelp_lang +Provides: locale(susehelp:hu) %description -n susehelp This package contains the basics of the SuSE Help System. @@ -190,6 +199,7 @@ %prep %setup -n %{name} +%patch0 -p1 %build make ++++++ susehelp-ghelp-for-yelp.patch ++++++ Index: susehelp/bin/susehelp =================================================================== --- susehelp.orig/bin/susehelp +++ susehelp/bin/susehelp @@ -97,8 +97,6 @@ if [ "$URI" = "" ]; then URI="$SUSEHOMEPAGE" fi -URI=$(echo $URI | sed 's/^ghelp:/help:/') - # Are we running KDE? USE_DESKTOP=${WINDOWMANAGER##*/} @@ -130,6 +128,7 @@ if [ "$DOC_HOST" = "localhost" ] && \ exit 0 else if [ "$USE_DESKTOP" = kde -o "$USE_DESKTOP" = startkde -o -z "$USE_LOCALSERVER" ]; then + URI=$(echo $URI | sed 's/^ghelp:/help:/') if [ "$KDE_HELP" != "" ]; then susehelp-khelpcenter $URI exit 0 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
