commit susehelp for openSUSE:Factory
Hello community,
here is the log from the commit of package susehelp for openSUSE:Factory
checked in at 2015-12-03 13:27:58
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.changes2015-04-16
14:12:18.0 +0200
+++ /work/SRC/openSUSE:Factory/.susehelp.new/susehelp.changes 2015-12-03
13:27:59.0 +0100
@@ -1,0 +2,6 @@
+Tue Oct 20 16:30:56 UTC 2015 - alarr...@suse.com
+
+- Add susehelp-use-apache2.patch: Update old "apache" references
+ to "apache2" which is the current name used (bnc#936061).
+
+---
New:
susehelp-use-apache2.patch
Other differences:
--
++ susehelp.spec ++
--- /var/tmp/diff_new_pack.OfOqRj/_old 2015-12-03 13:28:00.0 +0100
+++ /var/tmp/diff_new_pack.OfOqRj/_new 2015-12-03 13:28:00.0 +0100
@@ -42,6 +42,8 @@
Patch0: susehelp-ghelp-for-yelp.patch
# PATCH-FIX-UPSTREAM susehelp-support-khelpcenter5.patch -- use khelpcenter5
in Plasma5 session
Patch1: susehelp-support-khelpcenter5.patch
+# PATCH-FIX-OPENSUSE susehelp-use-apache2.patch bnc#936061 alarr...@suse.com
-- Update old apache references to the current apache2
+Patch2: susehelp-use-apache2.patch
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -203,6 +205,7 @@
%setup -n %{name}
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
make
++ susehelp-use-apache2.patch ++
Index: susehelp/README
===
--- susehelp.orig/README
+++ susehelp/README
@@ -26,7 +26,7 @@ How to start: click the openSUSE geeko i
Needed packages: apache2, any browser (konqueror, MozillaFirefox, etc).
You may use any other combination of webserver and webbrowser, but the
-instructions here describe how to setup apaches. Don't forget to start
+instructions here describe how to setup apache. Don't forget to start
your webserver.
How to start: Follow instructions at 2.2, then point your browser to
@@ -43,7 +43,7 @@ Needed packages: susehelp and a browser
How to start: just point your browser to http://SERVER-Name/susehelp/
Server:
-Needed packages: susehelp, web-server (e.g. apache), documentation packages)
+Needed packages: susehelp, web-server (e.g. apache2), documentation packages)
2. Configuration
@@ -85,7 +85,7 @@ DOC_SERVER="yes"
Don't forget to replace "myhelpserver.domain.example" with the name of the
doc server, usually the same as FQHOSTNAME.
-Afterwards run "/sbin/SuSEconfig" and start apache with "rcapache start".
+Afterwards run "/sbin/SuSEconfig" and start apache with "rcapache2 start".
Remember to have fun!
@@ -176,6 +176,6 @@ DOC_SERVER="yes"
Dabei ist myhelpserver.domain.example entsprechend zu ersetzen.
Anschlie�end lassen Sie "/sbin/SuSEconfig" laufen und starten den
-Web-Server mit "rcapache start".
+Web-Server mit "rcapache2 start".
SUSE w�nscht Ihnen viel Spass ...
Index: susehelp/README.install
===
--- susehelp.orig/README.install
+++ susehelp/README.install
@@ -39,4 +39,4 @@ directory by setting the variable DESTDI
install-link - Don't install regular files, but link files from the
source
directory. Useful for testing.
- conf/Makefile - Installs configuration files for apache and SuSEConfig.
+ conf/Makefile - Installs configuration files for apache2 and SuSEConfig.
Index: susehelp/conf/sysconfig.apache2-susehelp
===
--- susehelp.orig/conf/sysconfig.apache2-susehelp
+++ susehelp/conf/sysconfig.apache2-susehelp
@@ -3,8 +3,8 @@
## Description: SuSE help doc server configuration
## Type: yesno
## Default: no
-## Config: apache
-## ServiceRestart: apache
+## Config: apache2
+## ServiceRestart: apache2
## Command:
#
# Set this to yes on the central documentation server
Index: susehelp/conf/sysconfig.susehelp
===
--- susehelp.orig/conf/sysconfig.susehelp
+++ susehelp/conf/sysconfig.susehelp
@@ -15,8 +15,8 @@ DOC_HOST="localhost"
## Type: string(localhost)
## Default:localhost
-## Config: susehelp, apache
-## ServiceRestart: apache
+## Config: susehelp, apache2
+## ServiceRestart: apache2
## Command:
#
# List of host/domain patterns for use with access restrictions for
commit susehelp for openSUSE:Factory
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.changes2012-08-04
13:33:15.0 +0200
+++ /work/SRC/openSUSE:Factory/.susehelp.new/susehelp.changes 2015-04-16
14:12:18.0 +0200
@@ -1,0 +2,6 @@
+Sun Apr 12 17:26:16 UTC 2015 - hrvoje.sen...@gmail.com
+
+- 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.0 +0200
+++ /var/tmp/diff_new_pack.93Jjhx/_new 2015-04-16 14:12:18.0 +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
dims...@opensuse.org -- 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.0 +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";
}
commit susehelp for openSUSE:Factory
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 "wstephen...@suse.com"
Changes:
--- /work/SRC/openSUSE:Factory/susehelp/susehelp.changes2011-09-23
12:47:07.0 +0200
+++ /work/SRC/openSUSE:Factory/.susehelp.new/susehelp.changes 2012-08-04
13:33:15.0 +0200
@@ -1,0 +2,7 @@
+Fri Jul 20 21:56:22 UTC 2012 - dims...@opensuse.org
+
+- 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.0 +0200
+++ /var/tmp/diff_new_pack.fEI3Xc/_new 2012-08-04 13:33:16.0 +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
dims...@opensuse.org -- 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)
+Pro
commit susehelp for openSUSE:Factory
Hello community,
here is the log from the commit of package susehelp for openSUSE:Factory
checked in at 2011-12-06 19:06:23
Comparing /work/SRC/openSUSE:Factory/susehelp (Old)
and /work/SRC/openSUSE:Factory/.susehelp.new (New)
Package is "susehelp", Maintainer is "wstephen...@suse.com"
Changes:
Other differences:
--
++ susehelp.spec ++
--- /var/tmp/diff_new_pack.aWEE5Q/_old 2011-12-06 19:40:21.0 +0100
+++ /var/tmp/diff_new_pack.aWEE5Q/_new 2011-12-06 19:40:21.0 +0100
@@ -20,7 +20,7 @@
Name: susehelp
BuildRequires: apache2-devel libapr-util1-devel pcre-devel perl-XML-Parser
-License:GPL v2 or later
+License:GPL-2.0+
Group: Documentation/SUSE
Provides: manhtml susehilf dochost
Obsoletes: susehilf dochost
@@ -36,42 +36,42 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%package -n susehelp_en
-License:GPL v2 or later
+License:GPL-2.0+
Requires: susehelp
Summary:SuSE Help System (English)
Group: Documentation/SUSE
Provides: susehelp_lang locale(susehelp:en)
%package -n susehelp_de
-License:GPL v2 or later
+License:GPL-2.0+
Requires: susehelp
Summary:SuSE Help System (German)
Group: Documentation/SUSE
Provides: susehelp_lang locale(susehelp:de)
%package -n susehelp_fr
-License:GPL v2 or later
+License:GPL-2.0+
Requires: susehelp
Summary:SuSE Help-System (French)
Group: Documentation/SUSE
Provides: susehelp_lang locale(susehelp:fr)
%package -n susehelp_es
-License:GPL v2 or later
+License:GPL-2.0+
Requires: susehelp
Summary:SuSE Help System (Spanish)
Group: Documentation/SUSE
Provides: susehelp_lang locale(susehelp:es)
%package -n susehelp_it
-License:GPL v2 or later
+License:GPL-2.0+
Requires: susehelp
Summary:SuSE Help System (Italian)
Group: Documentation/SUSE
Provides: susehelp_lang locale(susehelp:it)
%package -n susehelp_cz
-License:GPL v2 or later
+License:GPL-2.0+
Requires: susehelp
Summary:SuSE Help System (Czech)
Group: Documentation/SUSE
@@ -79,7 +79,7 @@
Obsoletes: susehelp_cs
%package -n susehelp_hu
-License:GPL v2 or later
+License:GPL-2.0+
Requires: susehelp
Summary:SuSE Help System (Hungarian)
Group: Documentation/SUSE
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
