summaryrefslogtreecommitdiffstats
path: root/php-pecl-varnish.spec
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2018-06-27 15:47:31 +0200
committerRemi Collet <remi@remirepo.net>2018-06-27 15:47:31 +0200
commite83174c1d8d3d017a8290193b936ab8ea157b972 (patch)
treec7a1aa25af3414fcbc260bec033d715e1be23538 /php-pecl-varnish.spec
parent07f45bf4766b72af934a8ba7494dfd93e9a51ecc (diff)
add upstream patch for PHP 7.3
Diffstat (limited to 'php-pecl-varnish.spec')
-rw-r--r--php-pecl-varnish.spec16
1 files changed, 12 insertions, 4 deletions
diff --git a/php-pecl-varnish.spec b/php-pecl-varnish.spec
index a436ca7..8821500 100644
--- a/php-pecl-varnish.spec
+++ b/php-pecl-varnish.spec
@@ -13,9 +13,11 @@
%if 0%{?scl:1}
%global sub_prefix %{scl_prefix}
%scl_package php-pecl-varnish
+%else
+%global _root_sbindir %{_sbindir}
%endif
-%global with_zts 0%{?__ztsphp:1}
+%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}}
%global pecl_name varnish
%global with_tests %{?_with_tests:1}%{!?_with_tests:0}
%if "%{php_version}" < "5.6"
@@ -27,13 +29,15 @@
Summary: Varnish Cache bindings
Name: %{?sub_prefix}php-pecl-%{pecl_name}
Version: 1.2.3
-Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
License: BSD
URL: http://pecl.php.net/package/%{pecl_name}
Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
+Patch0: %{pecl_name}-upstream.patch
+
BuildRequires: %{?dtsprefix}gcc
-BuildRequires: %{?scl_prefix}php-devel > 5.3
+BuildRequires: %{?scl_prefix}php-devel
BuildRequires: %{?scl_prefix}php-pear
BuildRequires: %{?scl_prefix}php-hash
BuildRequires: varnish-libs-devel > 3
@@ -101,6 +105,7 @@ sed -e 's/role="test"/role="src"/' \
-i package.xml
cd NTS
+%patch0 -p3 -b .upstream
# Sanity check, really often broken
extver=$(sed -n '/#define PHP_VARNISH_VERSION/{s/.* "//;s/".*$//;p}' php_varnish.h)
@@ -213,7 +218,7 @@ else
PORTUSR=6081
PORTADM=6082
fi
-%{_sbindir}/varnishd \
+%{_root_sbindir}/varnishd \
-b 127.0.0.1:80 \
-P /tmp/varnish.pid \
-S /tmp/secret \
@@ -280,6 +285,9 @@ exit $ret
%changelog
+* Wed Jun 27 2018 Remi Collet <remi@remirepo.net> - 1.2.3-2
+- add upstream patch for PHP 7.3
+
* Mon Mar 5 2018 Remi Collet <remi@remirepo.net> - 1.2.3-1
- Update to 1.2.3