Hello community, here is the log from the commit of package susehelp for openSUSE:Factory checked in at 2015-04-16 14:12:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/susehelp (Old) and /work/SRC/openSUSE:Factory/.susehelp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "susehelp" Changes: -------- --- /work/SRC/openSUSE:Factory/susehelp/susehelp.changes 2012-08-04 13:33:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.susehelp.new/susehelp.changes 2015-04-16 14:12:18.000000000 +0200 @@ -1,0 +2,6 @@ +Sun Apr 12 17:26:16 UTC 2015 - [email protected] + +- Add susehelp-support-khelpcenter5.patch: Use khelpcenter5 in + Plasma5 session + +------------------------------------------------------------------- New: ---- susehelp-support-khelpcenter5.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ susehelp.spec ++++++ --- /var/tmp/diff_new_pack.93Jjhx/_old 2015-04-16 14:12:18.000000000 +0200 +++ /var/tmp/diff_new_pack.93Jjhx/_new 2015-04-16 14:12:18.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package susehelp # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -40,6 +40,8 @@ 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 +# PATCH-FIX-UPSTREAM susehelp-support-khelpcenter5.patch -- use khelpcenter5 in Plasma5 session +Patch1: susehelp-support-khelpcenter5.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -200,6 +202,7 @@ %prep %setup -n %{name} %patch0 -p1 +%patch1 -p1 %build make ++++++ susehelp-support-khelpcenter5.patch ++++++ --- susehelp.orig/bin/susehelp +++ susehelp/bin/susehelp @@ -114,6 +114,7 @@ fi # Which help browsers are available? GNOME_HELP=$(which 2>/dev/null yelp) KDE_HELP=$(which 2>/dev/null khelpcenter) +KDE5_HELP=$(which 2>/dev/null khelpcenter5) shlog USE_X: $USE_X shlog USE_DESKTOP: $USE_DESKTOP @@ -129,7 +130,7 @@ if [ "$DOC_HOST" = "localhost" ] && \ 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 + if [ "$KDE_HELP" != "" -o "$KDE5_HELP" != "" ]; then susehelp-khelpcenter $URI exit 0 else --- susehelp/bin/susehelp-khelpcenter 2009-10-06 16:26:45.000000000 +0200 +++ susehelp.new/bin/susehelp-khelpcenter 2015-04-12 18:55:32.407089821 +0200 @@ -4,15 +4,24 @@ $kdeversion = $ENV{KDE_SESSION_VERSION}; -if ($kdeversion == 4) { +if ($kdeversion == 5) { + $kshell = "kshell5"; + $kdeconfig = "kf5-config"; + $khelpcenter = "khelpcenter5"; + $meinproc = "meinproc5"; +} elsif ($kdeversion == 4) { $kshell = "kshell4"; $kdeconfig = "kde4-config"; -} else { + $khelpcenter = "khelpcenter"; + $meinproc = "meinproc4"; +} elsif ($kdeversion == 3) { $kshell = "kshell"; $kdeconfig = "kde-config"; + $khelpcenter = "khelpcenter"; + $meinproc = "meinproc"; } -system "$kshell khelpcenter > /dev/null" if $#ARGV < 0; +system "$kshell $khelpcenter > /dev/null" if $#ARGV < 0; foreach $filename (@ARGV) { @@ -32,7 +41,7 @@ foreach $filename (@ARGV) { if (!-f $cache_file) { $orig_file = "/usr/share/gnome/help/$base/$lang/$base.xml"; system ("mkdir -m700 -p $cache_dir"); - system ("meinproc --cache $cache_file $orig_file > /dev/null"); + system ("$meinproc --cache $cache_file $orig_file > /dev/null"); } } $/ = "<"; @@ -56,5 +65,5 @@ foreach $filename (@ARGV) { } } - system "$kshell khelpcenter $filename > /dev/null"; + system "$kshell $khelpcenter $filename > /dev/null"; }
