diff options
| author | Remi Collet <fedora@famillecollet.com> | 2016-03-08 14:55:23 +0100 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2016-03-08 14:55:23 +0100 |
| commit | 123c5232b309038ad373ea56cd8b6fa169d50420 (patch) | |
| tree | 6145ac2cf4f91ed8d07a7ddd2a5f84a202441022 | |
| parent | 25ae69d48a1e4022545f3025d111c5aaaac96ad1 (diff) | |
php-pecl-pq: F24
| -rw-r--r-- | php-pecl-pq-dev.spec | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/php-pecl-pq-dev.spec b/php-pecl-pq-dev.spec index f7a008a..418e8f1 100644 --- a/php-pecl-pq-dev.spec +++ b/php-pecl-pq-dev.spec @@ -15,9 +15,6 @@ %endif %{?scl: %scl_package php-pecl-pq} -%{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d} -%{!?__pecl: %global __pecl %{_bindir}/pecl} -%{!?__php: %global __php %{_bindir}/php} %global with_zts 0%{?__ztsphp:1} %global pecl_name pq @@ -43,7 +40,7 @@ Version: 1.0.0 %if 0%{?rcver:1} Release: 0.1.%{rcver}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} %else -Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} %endif License: BSD Group: Development/Languages @@ -67,12 +64,12 @@ Requires: %{?scl_prefix}php-json%{?_isa} Requires: %{?sub_prefix}php-raphf%{?_isa} >= 1.1.0 %{?_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} +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 @@ -116,7 +113,9 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO mv %{pecl_name}-%{version}%{?rcver} NTS # Don't install tests -sed -e '/role="test"/d' -i package.xml +sed -e 's/role="test"/role="src"/' \ + %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \ + -i package.xml cd NTS @@ -181,6 +180,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 @@ -197,6 +197,7 @@ fi if [ $1 -eq 0 -a -x %{__pecl} ] ; then %{pecl_uninstall} %{pecl_name} >/dev/null || : fi +%endif %check @@ -274,8 +275,8 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc %{pecl_docdir}/%{pecl_name} %{?_licensedir:%license NTS/LICENSE} +%doc %{pecl_docdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml %config(noreplace) %{php_inidir}/%{ini_name} @@ -288,6 +289,9 @@ rm -rf %{buildroot} %changelog +* Tue Mar 8 2016 Remi Collet <remi@fedoraproject.org> - 1.0.0-3 +- adapt for F24 + * Tue Jan 19 2016 Remi Collet <remi@fedoraproject.org> - 1.0.0-1 - Update to 1.0.0 (stable) @@ -322,4 +326,4 @@ rm -rf %{buildroot} - Update to 0.5.2 * Thu Oct 16 2014 Remi Collet <remi@fedoraproject.org> - 0.5.1-1 -- initial package, version 0.5.1 (beta)
\ No newline at end of file +- initial package, version 0.5.1 (beta) |