Accepting request 309129 from home:pgajdos

- align filenames with upstream names (and add compat symlinks)
- find_httpd2_includes renamed to find_httpd_includes

OBS-URL: https://build.opensuse.org/request/show/309129
OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=447

start_apache2

@@ -15,7 +15,7 @@ pname=apache2
 
 export ${!APACHE_*}
 
-apache_link=/usr/sbin/httpd2
+apache_link=/usr/sbin/httpd
 apache_bin=$(/usr/share/$pname/find_mpm 2>/dev/null)
 httpd_conf=${APACHE_HTTPD_CONF:-/etc/apache2/httpd.conf}
 
@@ -26,7 +26,7 @@ if [ -z "$APACHE_MPM" ]; then
 fi
 
 if ! [ -x $apache_bin ]; then
-	echo >&2 $apache_bin-$APACHE_MPM is not a valid httpd2 binary. 
+	echo >&2 $apache_bin-$APACHE_MPM is not a valid httpd binary. 
 	echo >&2 Check your APACHE_MPM setting in /etc/sysconfig/$pname.
 	exit 5
 fi