commit 5052fcb6cfeb3814d6d64948461e5b8a21df5524
Author: Elan Ruusamäe <[email protected]>
Date: Sat May 2 22:53:02 2015 +0300
handle trigger if no matching glob
apache.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/apache.spec b/apache.spec
index f97f58f..5350c96 100644
--- a/apache.spec
+++ b/apache.spec
@@ -33,7 +33,7 @@ Summary(ru.UTF-8): Самый популярный веб-сервер
Summary(tr.UTF-8): Lider WWW tarayıcı
Name: apache
Version: 2.4.12
-Release: 3.26
+Release: 3.28
License: Apache v2.0
Group: Networking/Daemons/HTTP
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
@@ -2964,7 +2964,7 @@ sed -i -e '
s,^LockFile /var/run/httpd/accept.lock,Mutex file:/var/run/httpd/,g
' /etc/httpd/conf.d/10_mpm.conf
-%triggerpostun base -- %{name}-base < 2.4.12-3.15
+%triggerpostun base -- %{name}-base < 2.4.12-3.28
# skip *this* trigger on downgrade
if [ $1 -le 1 ]; then
exit 0
@@ -2977,6 +2977,9 @@ fi
od=%{_sysconfdir}/conf.d
nd=%{_sysconfdir}/conf.modules.d
for of in $od/??_*.conf.rpmsave; do
+ # skip if glob did not expand
+ test -f "$of" || continue
+
# first check matching conf.d file
bn=${of##*/??_}
bn=${bn%.rpmsave}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/apache.git/commitdiff/5052fcb6cfeb3814d6d64948461e5b8a21df5524
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
