From 214a6b8ed2b0387ff361209c4fa0a196b06b049149c1a2c675de60456d08f02d Mon Sep 17 00:00:00 2001
From: Petr Gajdos <pgajdos@suse.com>
Date: Thu, 17 Sep 2020 09:52:38 +0000
Subject: [PATCH] Accepting request 835119 from home:fbui:branches:Apache

- Make use of %service_del_postun_without_restart
  And stop using DISABLE_RESTART_ON_UPDATE as this interface is
  obsolete.

OBS-URL: https://build.opensuse.org/request/show/835119
OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=617
---
 apache2.changes | 8 ++++++++
 apache2.spec    | 3 +--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/apache2.changes b/apache2.changes
index f61f489..195c3f9 100644
--- a/apache2.changes
+++ b/apache2.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Sep 11 15:24:39 UTC 2020 - Franck Bui <fbui@suse.com>
+
+- Make use of %service_del_postun_without_restart
+
+  And stop using DISABLE_RESTART_ON_UPDATE as this interface is
+  obsolete.
+
 -------------------------------------------------------------------
 Mon Aug 31 11:08:16 UTC 2020 - Jacek Tomasiak <jtomasiak@suse.com>
 
diff --git a/apache2.spec b/apache2.spec
index 9348492..4a7b452 100644
--- a/apache2.spec
+++ b/apache2.spec
@@ -1438,8 +1438,7 @@ exit 0
 
 %postun
 %if 0%{?suse_version} >= 1210
-DISABLE_RESTART_ON_UPDATE='yes'
-%service_del_postun apache2.target
+%service_del_postun_without_restart apache2.target
 if [ "$1" = 1 ]; then
   %apache_request_restart
 fi