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.changes 2015-04-16
14:12:18.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.susehelp.new/susehelp.changes 2015-12-03
13:27:59.000000000 +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.000000000 +0100
+++ /var/tmp/diff_new_pack.OfOqRj/_new 2015-12-03 13:28:00.000000000 +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
