summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2018-06-26 12:55:03 +0200
committerRemi Collet <remi@remirepo.net>2018-06-26 12:55:03 +0200
commit72c97186ce983e749542618dc647845b4c990948 (patch)
treef81c735d81a55a0129add348b8a813644293bfcc
parente09f60c050d496bb1cc319bce7f988e57330ef2c (diff)
cleanup
-rw-r--r--php-pecl-mosquitto.spec23
1 files changed, 9 insertions, 14 deletions
diff --git a/php-pecl-mosquitto.spec b/php-pecl-mosquitto.spec
index 313b6d9..b628f5b 100644
--- a/php-pecl-mosquitto.spec
+++ b/php-pecl-mosquitto.spec
@@ -1,6 +1,6 @@
# remirepo spec file for php-pecl-mosquitto
#
-# Copyright (c) 2013-2017 Remi Collet
+# Copyright (c) 2013-2018 Remi Collet
# License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/
#
@@ -11,7 +11,7 @@
%scl_package php-pecl-mosquitto
%endif
-%global with_zts 0%{?__ztsphp:1}
+%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}}
%global pecl_name mosquitto
%global proj_name Mosquitto
%if "%{php_version}" < "5.6"
@@ -23,9 +23,8 @@
Summary: Extension for libmosquitto
Name: %{?sub_prefix}php-pecl-%{pecl_name}
Version: 0.4.0
-Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release: 4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
License: BSD
-Group: Development/Languages
URL: http://pecl.php.net/package/%{proj_name}
Source0: http://pecl.php.net/get/%{proj_name}-%{version}.tgz
@@ -33,7 +32,8 @@ Source0: http://pecl.php.net/get/%{proj_name}-%{version}.tgz
# From https://github.com/mgdm/Mosquitto-PHP/pull/73
Patch0: https://patch-diff.githubusercontent.com/raw/mgdm/Mosquitto-PHP/pull/73.patch
-BuildRequires: %{?scl_prefix}php-devel > 5.3
+BuildRequires: %{?dtsprefix}gcc
+BuildRequires: %{?scl_prefix}php-devel
BuildRequires: %{?scl_prefix}php-pear
BuildRequires: mosquitto-devel
@@ -52,14 +52,6 @@ Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{rele
%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
# Other third party repo stuff
-Obsoletes: php53-pecl-%{pecl_name}
-Obsoletes: php53u-pecl-%{pecl_name}
-Obsoletes: php54-pecl-%{pecl_name}
-Obsoletes: php54w-pecl-%{pecl_name}
-%if "%{php_version}" > "5.5"
-Obsoletes: php55u-pecl-%{pecl_name}
-Obsoletes: php55w-pecl-%{pecl_name}
-%endif
%if "%{php_version}" > "5.6"
Obsoletes: php56u-pecl-%{pecl_name}
Obsoletes: php56w-pecl-%{pecl_name}
@@ -168,7 +160,7 @@ do install -Dpm 644 NTS/$i %{buildroot}%{pecl_docdir}/%{proj_name}/$i
done
-%if 0%{?fedora} < 24
+%if 0%{?fedora} < 24 && 0%{?rhel} < 8
# when pear installed alone, after us
%triggerin -- %{?scl_prefix}php-pear
if [ -x %{__pecl} ] ; then
@@ -219,6 +211,9 @@ cd ../ZTS
%changelog
+* Tue Jun 26 2018 Remi Collet <remi@remirepo.net> - 0.4.0-4
+- cleanup
+
* Tue Jul 18 2017 Remi Collet <remi@remirepo.net> - 0.4.0-3
- rebuild for PHP 7.2.0beta1 new API