Skip to content
This repository was archived by the owner on Apr 24, 2020. It is now read-only.

Commit 4e3bb82

Browse files
committed
Use modern conditional for zts
1 parent 0ee53e0 commit 4e3bb82

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

SPECS/php71u-pecl-apcu-bc.spec

+8-6
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,12 @@
1414
%global pecl_name apcu_bc
1515
%global ext_name apc
1616
%global apcver %(%{_bindir}/php -r 'echo (phpversion("apcu")?:0);' 2>/dev/null || echo 65536)
17-
%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}}
1817
# After 40-apcu.ini
1918
%global ini_name 50-%{ext_name}.ini
2019
%global php php71u
2120

21+
%bcond_without zts
22+
2223
Name: %{php}-pecl-apcu-bc
2324
Summary: APCu Backwards Compatibility Module
2425
Version: 1.0.3
@@ -97,7 +98,7 @@ if test "x${extver}" != "x%{version}%{?prever}%{?gh_date:dev}"; then
9798
fi
9899
popd
99100

100-
%if %{with_zts}
101+
%if %{with zts}
101102
# duplicate for ZTS build
102103
cp -pr NTS ZTS
103104
%endif
@@ -119,7 +120,7 @@ pushd NTS
119120
make %{?_smp_mflags}
120121
popd
121122

122-
%if %{with_zts}
123+
%if %{with zts}
123124
pushd ZTS
124125
%{_bindir}/zts-phpize
125126
%configure \
@@ -135,7 +136,7 @@ popd
135136
make -C NTS install INSTALL_ROOT=%{buildroot}
136137
install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name}
137138

138-
%if %{with_zts}
139+
%if %{with zts}
139140
# Install the ZTS stuff
140141
make -C ZTS install INSTALL_ROOT=%{buildroot}
141142
install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name}
@@ -166,7 +167,7 @@ REPORT_EXIT_STATUS=1 \
166167
%{__php} -n run-tests.php --show-diff
167168
popd
168169

169-
%if %{with_zts}
170+
%if %{with zts}
170171
pushd ZTS
171172
%{__ztsphp} -n \
172173
-d extension=apcu.so \
@@ -201,7 +202,7 @@ fi
201202
%config(noreplace) %{php_inidir}/%{ini_name}
202203
%{php_extdir}/apc.so
203204

204-
%if %{with_zts}
205+
%if %{with zts}
205206
%config(noreplace) %{php_ztsinidir}/%{ini_name}
206207
%{php_ztsextdir}/apc.so
207208
%endif
@@ -212,6 +213,7 @@ fi
212213
- Port from Fedora to IUS
213214
- Install package.xml as %%{pecl_name}.xml, not %%{name}.xml
214215
- Re-add scriptlets (file triggers not yet available in EL)
216+
- Use modern conditional for zts
215217

216218
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.3-5
217219
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild

0 commit comments

Comments
 (0)