From 952127e5450e1fa41f99a61cfd0e8bd74019ede4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 22 Aug 2017 07:59:59 +0200 Subject: cleanup for review --- php-pecl-inotify.spec | 90 +++++++++++---------------------------------------- 1 file changed, 19 insertions(+), 71 deletions(-) diff --git a/php-pecl-inotify.spec b/php-pecl-inotify.spec index a24d9bf..a98c0ec 100644 --- a/php-pecl-inotify.spec +++ b/php-pecl-inotify.spec @@ -1,3 +1,6 @@ +# Fedora spec file for php-pecl-inotify +# Without SCL compatibility from: +# # remirepo spec file for php-pecl-inotify # # Copyright (c) 2013-2017 Remi Collet @@ -6,69 +9,35 @@ # # Please, preserve the changelog entries # -%{?scl: %scl_package php-pecl-inotify} %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} %global pecl_name inotify %global ini_name 40-%{pecl_name}.ini Summary: Inotify -Name: %{?scl_prefix}php-pecl-%{pecl_name} +Name: php-pecl-%{pecl_name} Version: 2.0.0 -Release: 6%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 1%{?dist} License: PHP Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz -BuildRequires: %{?scl_prefix}php-devel > 7 -BuildRequires: %{?scl_prefix}php-pear - -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(%{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} && 0%{?rhel} -# Other third party repo stuff -Obsoletes: php53-pecl-%{pecl_name} <= %{version} -Obsoletes: php53u-pecl-%{pecl_name} <= %{version} -Obsoletes: php54-pecl-%{pecl_name} <= %{version} -Obsoletes: php54w-pecl-%{pecl_name} <= %{version} -Obsoletes: php55u-pecl-%{pecl_name} <= %{version} -Obsoletes: php55w-pecl-%{pecl_name} <= %{version} -Obsoletes: php56u-pecl-%{pecl_name} <= %{version} -Obsoletes: php56w-pecl-%{pecl_name} <= %{version} -Obsoletes: php70u-pecl-%{pecl_name} <= %{version} -Obsoletes: php70w-pecl-%{pecl_name} <= %{version} -%if "%{php_version}" > "7.1" -Obsoletes: php71u-pecl-%{pecl_name} <= %{version} -Obsoletes: php71w-pecl-%{pecl_name} <= %{version} -%endif -%if "%{php_version}" > "7.2" -Obsoletes: php72u-pecl-%{pecl_name} <= %{version} -Obsoletes: php72w-pecl-%{pecl_name} <= %{version} -%endif -%endif +BuildRequires: php-devel > 7 +BuildRequires: php-pear -%if 0%{?fedora} < 20 && 0%{?rhel} < 7 -# Filter shared private -%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$} -%{?filter_setup} -%endif +Requires: php(zend-abi) = %{php_zend_api} +Requires: php(api) = %{php_core_api} + +Provides: php-%{pecl_name} = %{version} +Provides: php-%{pecl_name}%{?_isa} = %{version} +Provides: php-pecl(%{pecl_name}) = %{version} +Provides: php-pecl(%{pecl_name})%{?_isa} = %{version} %description The inotify extension allows to use inotify functions in a PHP script. -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 %setup -q -c @@ -78,7 +47,7 @@ mv package2.xml package.xml sed -e '/inotify.php/s/role="php"/role="doc"/' \ -e '/tail.php/s/role="php"/role="doc"/' \ -e 's/role="test"/role="src"/' \ - %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \ + -e '/LICENSE/s/role="doc"/role="src"/' \ -i package.xml cd NTS @@ -104,8 +73,6 @@ EOF %build -%{?dtsenable} - cd NTS %{_bindir}/phpize %configure \ @@ -126,8 +93,6 @@ make %{?_smp_mflags} %install -%{?dtsenable} - make -C NTS install INSTALL_ROOT=%{buildroot} # install config file @@ -149,26 +114,6 @@ do install -Dpm 644 $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 - %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || : -fi - -# posttrans as pear can be installed after us -%posttrans -if [ -x %{__pecl} ] ; then - %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || : -fi - -%postun -if [ $1 -eq 0 -a -x %{__pecl} ] ; then - %{pecl_uninstall} %{pecl_name} >/dev/null || : -fi -%endif - - %check : Minimal load test for NTS extension cd NTS @@ -201,7 +146,7 @@ REPORT_EXIT_STATUS=1 \ %files -%{?_licensedir:%license NTS/LICENSE} +%license NTS/LICENSE %doc %{pecl_docdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml @@ -215,6 +160,9 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Tue Aug 22 2017 Remi Collet - 2.0.0-1 +- cleanup for Fedora review + * Tue Jul 18 2017 Remi Collet - 2.0.0-6 - rebuild for PHP 7.2.0beta1 new API -- cgit