summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2020-05-18 12:14:15 +0200
committerRemi Collet <remi@remirepo.net>2020-05-18 12:14:15 +0200
commit3c4cb0e6e47b844019d16ee85040291a1ac3adc0 (patch)
tree44dc0fc4e6dd664562f2ce70d0dc1cf3461b08c3
parent87e92bfdf99e612007bbe38bb24803acc53acc06 (diff)
cleanupHEADmaster
-rw-r--r--php-pecl-zmq.spec15
1 files changed, 4 insertions, 11 deletions
diff --git a/php-pecl-zmq.spec b/php-pecl-zmq.spec
index 8c3fa68..c428179 100644
--- a/php-pecl-zmq.spec
+++ b/php-pecl-zmq.spec
@@ -3,7 +3,7 @@
#
# Fedora spec file for php-pecl-zmq
#
-# Copyright (c) 2013-2019 Remi Collet
+# Copyright (c) 2013-2020 Remi Collet
# License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/
#
@@ -16,7 +16,7 @@
%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}}
%global pecl_name zmq
-%global with_tests %{?_without_tests:0}%{!?_without_tests:1}
+%global with_tests 0%{!?_without_tests:1}
%if "%{php_version}" < "5.6"
%global ini_name %{pecl_name}.ini
%else
@@ -28,14 +28,10 @@ Name: %{?sub_prefix}php-pecl-%{pecl_name}
Version: 1.1.3
Release: 11%{?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: https://patch-diff.githubusercontent.com/raw/mkoppanen/php-zmq/pull/170.patch
-Patch1: https://patch-diff.githubusercontent.com/raw/mkoppanen/php-zmq/pull/195.patch
+URL: https://pecl.php.net/package/%{pecl_name}
+Source0: https://pecl.php.net/get/%{pecl_name}-%{version}.tgz
BuildRequires: %{?dtsprefix}gcc
-# see https://github.com/mkoppanen/php-zmq/pull/190 build ok bug segfaults
BuildRequires: %{?scl_prefix}php-devel
BuildRequires: %{?scl_prefix}php-pear
%if 0%{?fedora} >= 22 || 0%{?rhel} >= 7
@@ -116,9 +112,6 @@ sed -e 's/role="test"/role="src"/' \
mv %{pecl_name}-%{version} NTS
cd NTS
-%patch0 -p1 -b .pr170
-%patch1 -p1 -b .pr195
-
if pkg-config libzmq --atleast-version=4
then
# fix new default of MAX_SOCKETS