From 5f6514874a9b7aeaa82d519baa21f572589ab9702dade4192852f177a57cf2bd Mon Sep 17 00:00:00 2001
From: Kristyna Streitova <kstreitova@suse.com>
Date: Thu, 9 Apr 2015 15:49:19 +0000
Subject: [PATCH 1/2] Accepting request 295183 from home:pgajdos

- /etc/init.d/apache2 reload -> systemctl reload apache2.service
  in apache2.logrotate [bnc#926523]

- authz_default -> authz_core in sysconfig.apache2/APACHE_MODULES
  [bnc#922236]

OBS-URL: https://build.opensuse.org/request/show/295183
OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=441
---
 apache2.changes   | 12 ++++++++++++
 apache2.logrotate | 10 +++++-----
 sysconfig.apache2 |  2 +-
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/apache2.changes b/apache2.changes
index a7d1c95..ac90b58 100644
--- a/apache2.changes
+++ b/apache2.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Thu Apr  9 13:12:46 UTC 2015 - pgajdos@suse.com
+
+- /etc/init.d/apache2 reload -> systemctl reload apache2.service
+  in apache2.logrotate [bnc#926523]
+
+-------------------------------------------------------------------
+Mon Mar 30 08:42:07 UTC 2015 - pgajdos@suse.com
+
+- authz_default -> authz_core in sysconfig.apache2/APACHE_MODULES
+  [bnc#922236]
+
 -------------------------------------------------------------------
 Tue Mar 10 17:16:21 UTC 2015 - dimstar@opensuse.org
 
diff --git a/apache2.logrotate b/apache2.logrotate
index 37fe7e1..15bd938 100644
--- a/apache2.logrotate
+++ b/apache2.logrotate
@@ -8,7 +8,7 @@
     missingok
     create 644 root root
     postrotate
-     /etc/init.d/apache2 reload
+    systemctl reload apache2.service
     endscript
 }
 
@@ -22,7 +22,7 @@
     missingok
     create 644 root root
     postrotate
-     /etc/init.d/apache2 reload
+    systemctl reload apache2.service
     endscript
 }
 
@@ -36,7 +36,7 @@
     missingok
     create 644 root root
     postrotate
-     /etc/init.d/apache2 reload
+    systemctl reload apache2.service
     endscript
 }
 
@@ -50,7 +50,7 @@
     missingok
     create 644 root root
     postrotate
-     /etc/init.d/apache2 reload
+    systemctl reload apache2.service
     endscript
 }
 
@@ -64,6 +64,6 @@
     missingok
     create 644 root root
     postrotate
-     /etc/init.d/apache2 reload
+    systemctl reload apache2.service
     endscript
 }
diff --git a/sysconfig.apache2 b/sysconfig.apache2
index 8d93d12..4353a86 100644
--- a/sysconfig.apache2
+++ b/sysconfig.apache2
@@ -79,7 +79,7 @@ APACHE_CONF_INCLUDE_DIRS=""
 # apache's default installation
 # APACHE_MODULES="authz_host actions alias asis auth autoindex cgi dir imap include log_config mime negotiation setenvif status userdir"
 # your settings
-APACHE_MODULES="actions alias auth_basic authn_file authz_host authz_groupfile authz_default authz_user autoindex cgi dir env expires include log_config mime negotiation setenvif ssl socache_shmcb userdir php5 reqtimeout"
+APACHE_MODULES="actions alias auth_basic authn_file authz_host authz_groupfile authz_core authz_user autoindex cgi dir env expires include log_config mime negotiation setenvif ssl socache_shmcb userdir php5 reqtimeout"
 
 
 ## Type:	string

From 70524cd248a5ccaf5254692c944a3d45c6488aabdc47eef9fde4ab30f5768156 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= <crrodriguez@opensuse.org>
Date: Fri, 10 Apr 2015 01:12:40 +0000
Subject: [PATCH 2/2] Accepting request 295209 from
 home:kstreitova:branches:Apache

- remove 'exit 0' from the %post section in the specfile that was
  placed here incorrectly and caused that the rest of the %post
  section couldn't be executed.

OBS-URL: https://build.opensuse.org/request/show/295209
OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=442
---
 apache2.changes | 7 +++++++
 apache2.spec    | 1 -
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/apache2.changes b/apache2.changes
index ac90b58..8a9e3aa 100644
--- a/apache2.changes
+++ b/apache2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Apr  9 15:53:27 UTC 2015 - kstreitova@suse.com
+
+- remove 'exit 0' from the %post section in the specfile that was
+  placed here incorrectly and caused that the rest of the %post
+  section couldn't be executed. 
+
 -------------------------------------------------------------------
 Thu Apr  9 13:12:46 UTC 2015 - pgajdos@suse.com
 
diff --git a/apache2.spec b/apache2.spec
index ce83508..aee5c99 100644
--- a/apache2.spec
+++ b/apache2.spec
@@ -1295,7 +1295,6 @@ if [ $1 -gt 1 ] ; then
 	chown --reference=./%{sysconfdir}/httpd.conf $tmpfile
 	cmp -s $tmpfile ./%{sysconfdir}/httpd.conf || cp -p $tmpfile ./%{sysconfdir}/httpd.conf
 fi
-exit 0
 
 rm -rf $tmpdir
 %{_datadir}/%{name}/apache-20-22-upgrade