diff options
| -rw-r--r-- | php-pecl-yar.spec | 46 |
1 files changed, 36 insertions, 10 deletions
diff --git a/php-pecl-yar.spec b/php-pecl-yar.spec index 108ce92..072401f 100644 --- a/php-pecl-yar.spec +++ b/php-pecl-yar.spec @@ -6,24 +6,22 @@ # # Please, preserve the changelog entries # -%{!?php_inidir: %{expand: %%global php_inidir %{_sysconfdir}/php.d}} -%{!?php_incldir: %{expand: %%global php_incldir %{_includedir}/php}} -%{!?__pecl: %{expand: %%global __pecl %{_bindir}/pecl}} +%{!?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 yar Summary: Light, concurrent RPC framework Name: php-pecl-%{pecl_name} -Version: 1.2.0 -Release: 1%{?dist}.1 +Version: 1.2.1 +Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} License: BSD Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz -# https://bugs.php.net/65863 ask license file - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: curl-devel BuildRequires: php-devel @@ -34,8 +32,14 @@ Requires(post): %{__pecl} Requires(postun): %{__pecl} Requires: php(zend-abi) = %{php_zend_api} Requires: php(api) = %{php_core_api} +%if "%{php_version}" < "5.4" +# php 5.3.3 in EL-6 don't use arched virtual provides +# so only requires real packages instead +Requires: php-common%{?_isa} +%else Requires: php-curl%{?_isa} Requires: php-json%{?_isa} +%endif Requires: php-pecl(msgpack)%{?_isa} Provides: php-%{pecl_name} = %{version} @@ -43,9 +47,12 @@ Provides: php-%{pecl_name}%{?_isa} = %{version} Provides: php-pecl(%{pecl_name}) = %{version} Provides: php-pecl(%{pecl_name})%{?_isa} = %{version} +%if 0%{?fedora} < 20 # Filter shared private %{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$} %{?filter_setup} +%endif + %description Yar (Yet another RPC framework) is a light, concurrent RPC framework, @@ -58,13 +65,17 @@ mv %{pecl_name}-%{version} NTS cd NTS # Sanity check, really often broken -extver=$(sed -n '/#define YAR_VERSION/{s/.* "//;s/".*$//;p}' php_yar.h) +extver=$(sed -n '/#define PHP_YAR_VERSION/{s/.* "//;s/".*$//;p}' php_yar.h) if test "x${extver}" != "x%{version}%{?prever:-%{prever}}"; then : Error: Upstream extension version is ${extver}, expecting %{version}%{?prever:-%{prever}}. exit 1 fi cd .. +sed -e '/LICENSE/s/role="src"/role="doc"/' \ + -e '/CREDITS/s/role="src"/role="doc"/' \ + -i package2.xml + %if %{with_zts} # Duplicate source tree for NTS / ZTS build cp -pr NTS ZTS @@ -124,6 +135,15 @@ make -C ZTS \ install -D -m 644 %{pecl_name}.ini %{buildroot}%{php_ztsinidir}/%{pecl_name}.ini %endif +# Test & Documentation +cd NTS +for i in $(grep 'role="test"' ../package2.xml | sed -e 's/^.*name="//;s/".*$//') +do install -Dpm 644 $i %{buildroot}%{pecl_testdir}/%{pecl_name}/$i +done +for i in $(grep 'role="doc"' ../package2.xml | sed -e 's/^.*name="//;s/".*$//') +do install -Dpm 644 $i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i +done + %post %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || : @@ -138,7 +158,7 @@ fi %check # Upstream test suite requires a web server : Minimal load test for NTS extension -php --no-php-ini \ +%{__php} --no-php-ini \ --define extension=json.so \ --define extension=msgpack.so \ --define extension=NTS/modules/%{pecl_name}.so \ @@ -160,7 +180,8 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc NTS/CREDITS +%doc %{pecl_docdir}/%{pecl_name} +%doc %{pecl_testdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml %config(noreplace) %{php_inidir}/%{pecl_name}.ini %{php_extdir}/%{pecl_name}.so @@ -172,5 +193,10 @@ rm -rf %{buildroot} %changelog +* Tue Nov 19 2013 Remi Collet <remi@fedoraproject.org> - 1.2.1-1 +- Update to 1.2.1 (stable) +- install doc in pecl doc_dir +- install tests in pecl test_dir + * Wed Jul 17 2013 Remi Collet <remi@fedoraproject.org> - 1.2.0-1 - initial package |