- drop openssl.patch, fix php-fpm man page link

diff --git a/php.spec b/php.spec
index fb138a4807909ca82adee8e92641b09b42396fc4..aab0a30c2748d59c5649178b0bb3813da3ae80f3 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -137,8 +137,6 @@ Patch0:             %{orgname}-shared.patch
 Patch1:                %{orgname}-tld.patch
 Patch3:                %{orgname}-link-libs.patch
 Patch4:                intl-stdc++.patch
-# https://bugs.php.net/bug.php?id=79589
-Patch5:                openssl.patch
 Patch7:                %{orgname}-sapi-ini-file.patch
 Patch10:       %{orgname}-ini.patch
 Patch11:       embed.patch
@@ -1690,8 +1688,6 @@ cp -p php.ini-production php.ini
 %patch -P1 -p1
 %patch -P3 -p1
 %patch -P4 -p1
-%patch -P5 -p1
-
 %patch -P7 -p1
 %patch -P10 -p1
 %patch -P14 -p1
@@ -2390,7 +2386,7 @@ fi
 %service %{name}-fpm restart
 update-alternatives \
        --install %{_sbindir}/php-fpm php-fpm %{_sbindir}/php%{php_suffix}-fpm %{php_suffix} \
-       --slave %{_mandir}/man8/php-fpm.8.gz php-fpm.8.gz %{_mandir}/man8/php-fpm%{php_suffix}.8.gz || :
+       --slave %{_mandir}/man8/php-fpm.8.gz php-fpm.8.gz %{_mandir}/man8/php%{php_suffix}-fpm.8.gz || :
 
 %preun fpm
 if [ "$1" = "0" ]; then