diff options
| author | Remi Collet <fedora@famillecollet.com> | 2016-03-08 14:24:27 +0100 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2016-03-08 14:24:27 +0100 |
| commit | a05648b4c0612479bca464794b3a57ba6e66ff0e (patch) | |
| tree | 2fc4763aecf9c591c7d7f6a5019b41fce77e4ac0 | |
| parent | 4881ae1795105bb03d649be7925f4094bcb4230e (diff) | |
php-pecl-mongo: F24
| -rw-r--r-- | php-pecl-mongo.spec | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/php-pecl-mongo.spec b/php-pecl-mongo.spec index 95aaa80..8324636 100644 --- a/php-pecl-mongo.spec +++ b/php-pecl-mongo.spec @@ -12,9 +12,6 @@ # Please preserve changelog entries # %{?scl: %scl_package php-pecl-mongo} -%{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d} -%{!?__pecl: %global __pecl %{_bindir}/pecl} -%{!?__php: %global __php %{_bindir}/php} %global pecl_name mongo %global with_zts 0%{?__ztsphp:1} @@ -36,7 +33,7 @@ Summary: PHP MongoDB database driver Name: %{?scl_prefix}php-pecl-mongo Version: 1.6.12 -Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Release: 2%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} License: ASL 2.0 Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} @@ -60,10 +57,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 @@ -104,6 +103,8 @@ mv %{gh_project}-%{gh_commit} NTS cp %{SOURCE1} %{ini_name} mv NTS/package.xml . +%{?_licensedir:sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml} + cd NTS # Sanity check, really often broken extver=$(sed -n '/#define PHP_MONGO_VERSION/{s/.* "//;s/".*$//;p}' php_mongo.h) @@ -162,6 +163,7 @@ done rm -rf %{buildroot} +%if 0%{?fedora} < 24 # when pear installed alone, after us %triggerin -- %{?scl_prefix}php-pear if [ -x %{__pecl} ] ; then @@ -178,6 +180,7 @@ fi if [ $1 -eq 0 -a -x %{__pecl} ] ; then %{pecl_uninstall} %{pecl_name} >/dev/null || : fi +%endif %check @@ -233,6 +236,7 @@ rm -rf data %files %defattr(-, root, root, -) +%{?_licensedir:%license NTS/LICENSE.md} %doc %{pecl_docdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml @@ -246,6 +250,10 @@ rm -rf data %changelog +* Tue Mar 8 2016 Remi Collet <remi@fedoraproject.org> - 1.6.12-2 +- adapt for F24 +- fix license management + * Wed Nov 25 2015 Remi Collet <remi@fedoraproject.org> - 1.6.12-1 - update to 1.6.12 (stable) |