From b3dd51283af8df492f60ee9ee9dab9f2132f3f17748861bf67ac25acad40fcc3 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Tue, 20 Jun 2017 14:12:55 +0000 Subject: [PATCH] - remove /usr/bin/http2 symlink only during apache2 package uninstall, not upgrade [bsc#1041830] OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=515 --- apache2.changes | 6 ++++++ apache2.spec | 13 ++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/apache2.changes b/apache2.changes index 9895b3d..63aff4c 100644 --- a/apache2.changes +++ b/apache2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jun 20 13:57:18 UTC 2017 - pgajdos@suse.com + +- remove /usr/bin/http2 symlink only during apache2 package + uninstall, not upgrade [bsc#1041830] + ------------------------------------------------------------------- Mon Jun 19 08:15:40 UTC 2017 - pgajdos@suse.com diff --git a/apache2.spec b/apache2.spec index 85ec44f..1f3ef69 100644 --- a/apache2.spec +++ b/apache2.spec @@ -1374,11 +1374,14 @@ exit 0 %if 0%{?suse_version} >= 1210 %service_del_preun apache2.target %endif -for i in %{_sbindir}/httpd \ - %{installbuilddir}/config_vars.mk -do - test -L $i && rm $i -done +# removing the symlink in case of uninstall (not upgrade) [bsc#1041830] +if [ $1 -eq 0 ]; then + for i in %{_sbindir}/httpd \ + %{installbuilddir}/config_vars.mk + do + test -L $i && rm $i + done +fi exit 0 %postun