From 81b518d8b82500a36fc7387b9a02b493eb46e0a3 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 22 Oct 2013 09:11:57 +0200 Subject: php-pecl-http1: cleanups for review --- php-pecl-http1.spec | 137 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 83 insertions(+), 54 deletions(-) (limited to 'php-pecl-http1.spec') diff --git a/php-pecl-http1.spec b/php-pecl-http1.spec index 2e487f4..bb3d746 100644 --- a/php-pecl-http1.spec +++ b/php-pecl-http1.spec @@ -6,15 +6,10 @@ # # Please, preserve the changelog entries # -%if 0%{?scl:1} -%scl_package php-pecl-http1 -%else -%global pkg_name %{name} -%endif -%{!?php_inidir: %{expand: %%global php_inidir %{_sysconfdir}/php.d}} -%{!?php_incldir: %{expand: %%global php_incldir %{_includedir}/php}} -%{!?__php: %{expand: %%global __php %{_bindir}/php}} -%{!?__pecl: %{expand: %%global __pecl %{_bindir}/pecl}} +%{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d} +%{!?php_incldir: %global php_incldir %{_includedir}/php} +%{!?__php: %global __php %{_bindir}/php} +%{!?__pecl: %global __pecl %{_bindir}/pecl} # The project is pecl_http but the extension is only http %global proj_name pecl_http @@ -22,9 +17,9 @@ %global with_zts 0%{?__ztsphp:1} # php-pecl-http exists and is version 2 -Name: %{?scl_prefix}php-pecl-http1 +Name: php-pecl-http1 Version: 1.7.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Extended HTTP support License: BSD @@ -36,11 +31,11 @@ Source0: http://pecl.php.net/get/%{proj_name}-%{version}.tgz Patch0: %{pecl_name}-ini.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: %{?scl_prefix}php-devel -BuildRequires: %{?scl_prefix}php-hash -BuildRequires: %{?scl_prefix}php-iconv -BuildRequires: %{?scl_prefix}php-session -BuildRequires: %{?scl_prefix}php-pear +BuildRequires: php-devel +BuildRequires: php-hash +BuildRequires: php-iconv +BuildRequires: php-session +BuildRequires: php-pear BuildRequires: pcre-devel BuildRequires: zlib-devel BuildRequires: libevent-devel @@ -48,27 +43,33 @@ BuildRequires: curl-devel Requires(post): %{__pecl} Requires(postun): %{__pecl} -Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} -Requires: %{?scl_prefix}php(api) = %{php_core_api} -Requires: %{?scl_prefix}php-hash%{?_isa} -Requires: %{?scl_prefix}php-iconv%{?_isa} -Requires: %{?scl_prefix}php-session%{?_isa} -# From upstream documentation -Conflicts: %{?scl_prefix}php-pecl-event -# Can install both version of the same extension -Conflicts: %{?scl_prefix}php-pecl-http - -Provides: %{?scl_prefix}php-pecl(%{proj_name}) = %{version} -Provides: %{?scl_prefix}php-pecl(%{proj_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_name} = %{version} -Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version} - +Requires: php(zend-abi) = %{php_zend_api} +Requires: php(api) = %{php_core_api} +Requires: php-hash%{?_isa} +Requires: php-iconv%{?_isa} +Requires: php-session%{?_isa} +# From phpcompatinfo on the PHP extension (pgsql is optional) +Requires: php-date%{?_isa} +Requires: php-pcre%{?_isa} +Requires: php-xmlrpc%{?_isa} +# From upstream documentation +Conflicts: php-pecl-event +# Can't install both version of the same extension +Conflicts: php-pecl-http + +Provides: php-pecl(%{proj_name}) = %{version} +Provides: php-pecl(%{proj_name})%{?_isa} = %{version} +Provides: php-pecl(%{pecl_name}) = %{version} +Provides: php-pecl(%{pecl_name})%{?_isa} = %{version} +Provides: php-%{pecl_name} = %{version} +Provides: php-%{pecl_name}%{?_isa} = %{version} + +%if 0%{?fedora} < 20 # Filter shared private %{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$} %{?filter_setup} +%endif %description @@ -85,17 +86,17 @@ It provides powerful request functionality, if built with CURL support. Parallel requests are available for PHP 5 and greater. Note: -. %{?scl_prefix}php-pecl-http1 provides API version 1 -. %{?scl_prefix}php-pecl-http provides API version 2 +. php-pecl-http1 provides API version 1 +. php-pecl-http provides API version 2 %package devel Summary: Extended HTTP support developer files (header) Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: %{?scl_prefix}php-devel%{?_isa} -# Can install both version of the same extension -Conflicts: %{?scl_prefix}php-pecl-http-devel +Requires: php-devel%{?_isa} +# Can't install both version of the same extension +Conflicts: php-pecl-http-devel %description devel These are the files needed to compile programs using HTTP extension. @@ -104,7 +105,8 @@ These are the files needed to compile programs using HTTP extension. %prep %setup -c -q -cd %{proj_name}-%{version} +mv %{proj_name}-%{version} NTS +cd NTS %patch0 -p1 -b .rpmconf extver=$(sed -n '/#define PHP_HTTP_VERSION/{s/.* "//;s/".*$//;p}' php_http.h) @@ -116,18 +118,18 @@ fi cd .. %if %{with_zts} -cp -pr %{proj_name}-%{version} %{proj_name}-zts +cp -pr NTS ZTS %endif %build -cd %{proj_name}-%{version} +cd NTS %{_bindir}/phpize %configure --with-php-config=%{_bindir}/php-config make %{?_smp_mflags} %if %{with_zts} -cd ../%{proj_name}-zts +cd ../ZTS %{_bindir}/zts-phpize %configure --with-php-config=%{_bindir}/zts-php-config make %{?_smp_mflags} @@ -137,24 +139,38 @@ make %{?_smp_mflags} %install rm -rf %{buildroot} -make -C %{proj_name}-%{version} \ - install INSTALL_ROOT=%{buildroot} +make -C NTS install INSTALL_ROOT=%{buildroot} # Install XML package description install -Dpm 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml # install config file (z-http.ini to be loaded after hash/iconv/session) -install -Dpm644 %{proj_name}-%{version}/docs/%{pecl_name}.ini \ +install -Dpm644 NTS/docs/%{pecl_name}.ini \ %{buildroot}%{php_inidir}/z-%{pecl_name}.ini %if %{with_zts} -make -C %{proj_name}-zts \ - install INSTALL_ROOT=%{buildroot} +make -C ZTS install INSTALL_ROOT=%{buildroot} -install -Dpm644 %{proj_name}-zts/docs/%{pecl_name}.ini \ +install -Dpm644 ZTS/docs/%{pecl_name}.ini \ %{buildroot}%{php_ztsinidir}/z-%{pecl_name}.ini %endif +# Test & Documentation +for i in $(grep 'role="test"' package.xml | sed -e 's/^.*name="//;s/".*$//') +do install -Dpm 644 NTS/$i %{buildroot}%{pecl_testdir}/%{proj_name}/$i +done +for i in $(grep 'role="doc"' package.xml | sed -e 's/^.*name="//;s/".*$//') +do install -Dpm 644 NTS/$i %{buildroot}%{pecl_docdir}/%{proj_name}/${i#docs/} +done + +# PHP Library +for i in $(grep 'role="php"' package.xml | sed -e 's/^.*name="//;s/".*$//') +do install -Dpm 644 NTS/$i %{buildroot}%{pear_phpdir}/pecl/http/$(basename $i) +done + +# RPM/PEAR consistency, to be checked after install +# pecl list-files pecl_http | while read a b c; do [ -n "$b" -a -z "$c" -a ! -f "$b" ] && echo missing $b; done + %check # Add needed extensions @@ -165,17 +181,17 @@ for mod in hash iconv session; do fi done -# Minimal load test for NTS extension +: Minimal load test for NTS extension %{__php} --no-php-ini \ $modules \ - --define extension=$PWD/%{proj_name}-%{version}/modules/%{pecl_name}.so \ + --define extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \ --modules | grep %{pecl_name} %if %{with_zts} -# Minimal load test for ZTS extension +: Minimal load test for ZTS extension %{__ztsphp} --no-php-ini \ $modules \ - --define extension=$PWD/%{proj_name}-zts/modules/%{pecl_name}.so \ + --define extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \ --modules | grep %{pecl_name} %endif @@ -196,18 +212,25 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc %{proj_name}-%{version}/{CREDITS,LICENSE,ThanksTo.txt} -%doc %{proj_name}-%{version}/docs +%doc %{pecl_docdir}/%{proj_name} +%exclude %{pecl_docdir}/%{proj_name}/examples %config(noreplace) %{php_inidir}/z-%{pecl_name}.ini %{php_extdir}/%{pecl_name}.so %{pecl_xmldir}/%{name}.xml + +%dir %{pear_phpdir}/pecl +%{pear_phpdir}/pecl/http + %if %{with_zts} %config(noreplace) %{php_ztsinidir}/z-%{pecl_name}.ini %{php_ztsextdir}/%{pecl_name}.so %endif + %files devel %defattr(-,root,root,-) +%doc %{pecl_docdir}/%{proj_name}/examples +%doc %{pecl_testdir}/%{proj_name} %{php_incldir}/ext/%{pecl_name} %if %{with_zts} %{php_ztsincldir}/ext/%{pecl_name} @@ -215,6 +238,12 @@ rm -rf %{buildroot} %changelog +* Tue Oct 22 2013 Remi Collet - 1.7.6-3 +- cleanups for review (drop SCL and EPEL-5 stuff) +- install doc in pecl doc_dir +- install tests in pecl test_dir +- install PHP library in /usr/share/pear/pecl/http + * Thu Aug 1 2013 Remi Collet - 1.7.6-2 - cleanups, adapt for SCL, make ZTS optional -- cgit