summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2016-03-08 16:57:42 +0100
committerRemi Collet <fedora@famillecollet.com>2016-03-08 16:57:42 +0100
commit44d9f3045e5cf6e3def8df489a728a82deefb3a7 (patch)
treeaa13c1a54bcd9e962e22480b1c7ac682f2abd491
parent952461438e282600881c3c9d22fabb63b6a1ded9 (diff)
php-pecl-strict: F24
-rw-r--r--php-pecl-strict.spec27
1 files changed, 16 insertions, 11 deletions
diff --git a/php-pecl-strict.spec b/php-pecl-strict.spec
index eae9452..ea6c39f 100644
--- a/php-pecl-strict.spec
+++ b/php-pecl-strict.spec
@@ -7,10 +7,6 @@
# Please, preserve the changelog entries
#
%{?scl: %scl_package php-pecl-strict}
-%{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d}
-%{!?php_incldir: %global php_incldir %{_includedir}/php}
-%{!?__pecl: %global __pecl %{_bindir}/pecl}
-%{!?__php: %global __php %{_bindir}/php}
%global with_zts 0%{?__ztsphp:1}
%global pecl_name strict
@@ -25,7 +21,7 @@
Summary: Strict scalar parameter type hint
Name: %{?scl_prefix}php-pecl-strict
Version: 0.4.1
-Release: 2%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Release: 3%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
License: PHP
Group: Development/Languages
URL: http://pecl.php.net/package/%{pecl_name}
@@ -41,10 +37,12 @@ Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api}
Requires: %{?scl_prefix}php(api) = %{php_core_api}
%{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}}
-Provides: %{?scl_prefix}php-%{pecl_name} = %{version}
-Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version}
-Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version}
+Provides: %{?scl_prefix}php-%{pecl_name} = %{version}
+Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version}
+Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version}
Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version}
+Provides: %{?scl_prefix}php-pecl-%{pecl_name} = %{version}-%{release}
+Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release}
%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1}
# Other third party repo stuff
@@ -72,7 +70,7 @@ Obsoletes: php56w-pecl-%{pecl_name} <= %{version}
%description
Strict scalar parameter type hint support for 5.4+.
-Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')%{?scl: as Software Collection}.
+Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')%{?scl: as Software Collection (%{scl} by %{?scl_vendor}%{!?scl_vendor:rh})}.
%prep
@@ -80,7 +78,9 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
mv %{pecl_name}-%{version} NTS
# Don't install tests
-sed -e 's/role="test"/role="src"/' -i package.xml
+sed -e 's/role="test"/role="src"/' \
+ %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \
+ -i package.xml
cd NTS
@@ -160,6 +160,7 @@ do install -Dpm 644 NTS/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i
done
+%if 0%{?fedora} < 24
# when pear installed alone, after us
%triggerin -- %{?scl_prefix}php-pear
if [ -x %{__pecl} ] ; then
@@ -176,6 +177,7 @@ fi
if [ $1 -eq 0 -a -x %{__pecl} ] ; then
%{pecl_uninstall} %{pecl_name} >/dev/null || :
fi
+%endif
%check
@@ -232,6 +234,9 @@ rm -rf %{buildroot}
%changelog
+* Tue Mar 8 2016 Remi Collet <remi@fedoraproject.org> - 0.4.1-3
+- adapt for F24
+
* Tue Jun 2 2015 Remi Collet <remi@fedoraproject.org> - 0.4.1-2
- drop runtime dependency on pear, new scriptlets
- fix configuration file for PHP 5.4
@@ -255,4 +260,4 @@ rm -rf %{buildroot}
- Update to 0.3.0 (beta)
* Tue Nov 18 2014 Remi Collet <remi@fedoraproject.org> - 0.2.0-1
-- initial package, version 0.2.0 (beta) \ No newline at end of file
+- initial package, version 0.2.0 (beta)