Accepting request 66521 from home:lnussel:branches:Apache

we need a new mkcert script. Ok.

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

apache2.spec

@@ -77,8 +77,6 @@ Source1:        apache2.changes
 Source10:       SUSE-NOTICE
 Source11:       rc.%{pname}
 Source13:       sysconfig.%{pname}
-Source16:       certificate.sh
-Source17:       mkcert.sh.gz
 Source18:       robots.txt
 Source20:       favicon.ico
 Source22:       apache2-README.QUICKSTART
@@ -319,14 +317,6 @@ Obsoletes:      apache-example-pages
 Some Example pages for Apache that show information about the installed
 server.
 
-%package example-certificates
-License:        ASLv..
-Summary:        Example certificates for the Apache 2 Web Server
-Group:          Productivity/Networking/Web/Servers
-
-%description example-certificates
-Snakeoil example certificates for Apache.
-
 %package utils
 License:        ASLv..
 Summary:        Apache 2 utilities
@@ -353,8 +343,6 @@ to administrators of web servers in general.
 #
 cat $RPM_SOURCE_DIR/SUSE-NOTICE >> NOTICE
 #
-cp -p %{S:16} %{S:17} .; gunzip mkcert.sh.gz
-#
 # replace PLATFORM string that's seen in the "Server:" header
 #
 sed 's,(" PLATFORM "),(%platform_string),' server/core.c > tmp_file && mv tmp_file server/core.c
@@ -597,8 +585,7 @@ install -m 644 %{S:48} $RPM_BUILD_ROOT%{_datadir}/omc/svcinfo.d/
 #
 # ssl stuff
 install -m 755 %{S:25} $RPM_BUILD_ROOT/%{_bindir}/
-chmod 755 certificate.sh mkcert.sh
-tar xjf $RPM_SOURCE_DIR/apache-ssl-stuff.tar.bz2 -C $RPM_BUILD_ROOT/%{sysconfdir}
+tar xjf %{SOURCE29} -C $RPM_BUILD_ROOT/%{sysconfdir}
 #
 # init script and friends
 mkdir -p $RPM_BUILD_ROOT/etc/init.d
@@ -619,8 +606,9 @@ install -m 755 $RPM_SOURCE_DIR/a2enmod $RPM_BUILD_ROOT/%{_sbindir}
 ln -s a2enmod $RPM_BUILD_ROOT/%{_sbindir}/a2dismod
 #
 # directories for files from other packages and other configuration
-mkdir -p $RPM_BUILD_ROOT/%{sysconfdir}/vhosts.d
-mkdir -p $RPM_BUILD_ROOT/%{sysconfdir}/sysconfig.d
+for i in vhosts.d sysconfig.d; do
+	mkdir -p $RPM_BUILD_ROOT/%{sysconfdir}/$i
+done
 #
 # make list of all modules, and install sysconfig template
 for i in $(find $RPM_BUILD_ROOT/%{libexecdir}-%{default_mpm} -name "*.so" | sort); do
@@ -824,8 +812,6 @@ mv $RPM_BUILD_ROOT/%{sysconfdir}/original .
 %defattr(-,root,root)
 %doc INSTALL READM* LICENSE ABOUT_APACHE CHANGES
 %doc support/SHA1
-%doc %attr(755,root,root) certificate.sh
-%doc %attr(755,root,root) mkcert.sh
 %doc %{_mandir}/man8/apachectl%{vers}.8.*
 %doc %{_mandir}/man8/htcacheclean%{vers}.8.*
 %doc %{_mandir}/man8/%{httpd}.8.*
@@ -851,11 +837,7 @@ mv $RPM_BUILD_ROOT/%{sysconfdir}/original .
 %dir %{sysconfdir}/ssl.csr
 %dir %attr(700,root,root) %{sysconfdir}/ssl.key
 %dir %{sysconfdir}/ssl.prm
-	%{sysconfdir}/ssl.*/README*
-%config %{sysconfdir}/ssl.*/Makefile
-%config(noreplace) %{sysconfdir}/ssl.crt/server.crt
-%config(noreplace) %{sysconfdir}/ssl.csr/server.csr
-%config(noreplace) %{sysconfdir}/ssl.key/server.key
+%{sysconfdir}/ssl.*/README*
 %dir %{sysconfdir}/conf.d
 %dir %{sysconfdir}/vhosts.d
 %dir %{sysconfdir}/sysconfig.d
@@ -946,11 +928,6 @@ mv $RPM_BUILD_ROOT/%{sysconfdir}/original .
 %config(noreplace) %{htdocsdir}/favicon.ico
 %config(noreplace) %{htdocsdir}/robots.txt
 
-%files example-certificates
-%defattr(-,root,root)
-%{sysconfdir}/ssl.*/snakeoil*
-%{sysconfdir}/ssl.*/*.0
-
 %files utils
 %defattr(-,root,root)
 %doc %{_mandir}/man8/ab%{vers}.8.*