From aa5d13a3b964387a6cbee0b27aadebc6dd7dfd6d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 22 Jul 2014 10:31:53 +0200 Subject: php-pecl-solr2: switch back to our spec (package approved) --- php-pecl-solr2-dev.spec | 309 ------------------------------------------------ php-pecl-solr2.spec | 59 ++++++--- 2 files changed, 42 insertions(+), 326 deletions(-) delete mode 100644 php-pecl-solr2-dev.spec diff --git a/php-pecl-solr2-dev.spec b/php-pecl-solr2-dev.spec deleted file mode 100644 index 72f9042..0000000 --- a/php-pecl-solr2-dev.spec +++ /dev/null @@ -1,309 +0,0 @@ -# spec file for php-pecl-solr2 -# -# Copyright (c) 2011-2014 Remi Collet -# Copyright (c) 2010 Johan Cwiklinski -# License: CC-BY-SA -# http://creativecommons.org/licenses/by-sa/3.0/ -# -# Please, preserve the changelog entries -# -%{?scl: %scl_package php-pecl-solr2} -%{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d} -%{!?__pecl: %global __pecl %{_bindir}/pecl} -%{!?__php: %global __php %{_bindir}/php} - -%global pecl_name solr -#global prever b -%global with_zts 0%{?__ztsphp:1} -%if "%{php_version}" < "5.6" -# After curl, json -%global ini_name %{pecl_name}.ini -%else -# After 20-curl, 40-json -%global ini_name 50-%{pecl_name}.ini -%endif - -Summary: Object oriented API to Apache Solr -Summary(fr): API orientée objet pour Apache Solr -Name: %{?scl_prefix}php-pecl-solr2 -Version: 2.0.0 -Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} -License: PHP -Group: Development/Languages -URL: http://pecl.php.net/package/solr - -Source0: http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: %{?scl_prefix}php-devel -BuildRequires: %{?scl_prefix}php-pear -BuildRequires: %{?scl_prefix}php-curl -BuildRequires: %{?scl_prefix}php-json -BuildRequires: curl-devel -BuildRequires: libxml2-devel - -Requires(post): %{__pecl} -Requires(postun): %{__pecl} -Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} -Requires: %{?scl_prefix}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: %{?scl_prefix}php-common%{?_isa} -%else -Requires: %{?scl_prefix}php-curl%{?_isa} -Requires: %{?scl_prefix}php-json%{?_isa} -%endif - -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} -# Only one version of the extension -Conflicts: %{?scl_prefix}php-pecl-solr < 2 - -%if "%{?vendor}" == "Remi Collet" -Obsoletes: php53-pecl-%{pecl_name}2 <= %{version} -Obsoletes: php53u-pecl-%{pecl_name}2 <= %{version} -Obsoletes: php54-pecl-%{pecl_name}2 <= %{version} -Obsoletes: php54w-pecl-%{pecl_name}2 <= %{version} -%if "%{php_version}" > "5.5" -Obsoletes: php55u-pecl-%{pecl_name}2 <= %{version} -Obsoletes: php55w-pecl-%{pecl_name}2 <= %{version} -%endif -%if "%{php_version}" > "5.6" -Obsoletes: php56u-pecl-%{pecl_name}2 <= %{version} -Obsoletes: php56w-pecl-%{pecl_name}2 <= %{version} -%endif -%endif - -%if 0%{?fedora} < 20 && 0%{?rhel} < 7 -# Filter shared private -%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$} -%{?filter_setup} -%endif - - -%description -It effectively simplifies the process of interacting with Apache Solr using -PHP5 and it already comes with built-in readiness for the latest features. - -The extension has features such as built-in, serializable query string builder -objects which effectively simplifies the manipulation of name-value pair -request parameters across repeated requests. - -The response from the Solr server is also automatically parsed into native php -objects whose properties can be accessed as array keys or object properties -without any additional configuration on the client-side. - -Its advanced HTTP client reuses the same connection across multiple requests -and provides built-in support for connecting to Solr servers secured behind -HTTP Authentication or HTTP proxy servers. It is also able to connect to -SSL-enabled containers. - -Please consult the documentation for more details on features. - http://php.net/solr - -Warning: PECL Solr 2 is not compatible with Solr Server < 4.0 -PECL Solr 1 is available in php-pecl-solr package. - - -%prep -%setup -c -q - -mv %{pecl_name}-%{version}%{?prever} NTS - -cd NTS - -# Check version -extver=$(sed -n '/#define PHP_SOLR_VERSION /{s/.* "//;s/".*$//;p}' php_solr_version.h) -if test "x${extver}" != "x%{version}%{?prever}"; then - : Error: Upstream version is ${extver}, expecting %{version}%{?prever}. - exit 1 -fi - -cd .. - -# Create configuration file -cat > %{ini_name} << 'EOF' -; Enable Solr extension module -extension=%{pecl_name}.so -EOF - -%if %{with_zts} -cp -r NTS ZTS -%endif - - -%build -cd NTS -%{_bindir}/phpize -%configure --with-php-config=%{_bindir}/php-config -make %{?_smp_mflags} - -%if %{with_zts} -cd ../ZTS -%{_bindir}/zts-phpize -%configure --with-php-config=%{_bindir}/zts-php-config -make %{?_smp_mflags} -%endif - - -%install -rm -rf %{buildroot} - -make -C NTS install INSTALL_ROOT=%{buildroot} - -# Install XML package description -install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml - -# install config file -install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name} - -%if %{with_zts} -make -C ZTS install INSTALL_ROOT=%{buildroot} -install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name} -%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}/%{pecl_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}/%{pecl_name}/$i -done - - -%post -%{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || : - - -%postun -if [ $1 -eq 0 ] ; then - %{pecl_uninstall} %{pecl_name} >/dev/null || : -fi - - -%check -cd NTS - -: Minimal load test for NTS installed extension -%{__php} \ - -n \ - -d extension=curl.so \ - -d extension=json.so \ - -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \ - -m | grep %{pecl_name} - -: Upstream test suite for NTS extension -TEST_PHP_ARGS="-n -d extension=curl.so -d extension=json.so -d extension=$PWD/modules/%{pecl_name}.so" \ -REPORT_EXIT_STATUS=1 \ -NO_INTERACTION=1 \ -TEST_PHP_EXECUTABLE=%{__php} \ -%{__php} -n run-tests.php - -%if %{with_zts} -cd ../ZTS - -: Minimal load test for ZTS installed extension -%{__ztsphp} \ - -n \ - -d extension=curl.so \ - -d extension=json.so \ - -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \ - -m | grep %{pecl_name} - -: Upstream test suite for ZTS extension -TEST_PHP_ARGS="-n -d extension=curl.so -d extension=json.so -d extension=$PWD/modules/%{pecl_name}.so" \ -REPORT_EXIT_STATUS=1 \ -NO_INTERACTION=1 \ -TEST_PHP_EXECUTABLE=%{__ztsphp} \ -%{__ztsphp} -n run-tests.php -%endif - - -%clean -rm -rf %{buildroot} - - -%files -%defattr(-, root, root, -) -%doc %{pecl_docdir}/%{pecl_name} -%doc %{pecl_testdir}/%{pecl_name} -%{pecl_xmldir}/%{name}.xml - -%config(noreplace) %{php_inidir}/%{ini_name} -%{php_extdir}/%{pecl_name}.so - -%if %{with_zts} -%config(noreplace) %{php_ztsinidir}/%{ini_name} -%{php_ztsextdir}/%{pecl_name}.so -%endif - - -%changelog -* Tue Jun 24 2014 Remi Collet - 2.0.0-1 -- update to 2.0.0 - -* Mon Jun 23 2014 Remi Collet - 2.0.0-0.4 -- test build before 2.0.0 finale - -* Thu Apr 17 2014 Remi Collet - 2.0.0-0.3.beta -- add numerical prefix to extension configuration file (php 5.6) - -* Tue Mar 25 2014 Remi Collet - 2.0.0-0.2.beta -- allow SCL build - -* Sat Mar 8 2014 Remi Collet - 2.0.0-0.1.beta -- update to 2.0.0b (beta) -- install doc in pecl_docdir -- install tests in pecl_testdir - -* Sun Oct 21 2012 Remi Collet - 1.0.2-4 -- rebuild - -* Tue Nov 29 2011 Remi Collet - 1.0.2-2 -- php 5.4 build - -* Tue Nov 29 2011 Remi Collet - 1.0.2-1 -- update to 1.0.2 - -* Mon Nov 28 2011 Remi Collet - 1.0.1-4.svn320130 -- svn snapshot (test suite is now ok) - -* Wed Nov 16 2011 Remi Collet - 1.0.1-3 -- build against php 5.4 -- ignore test result because of https://bugs.php.net/60313 - -* Thu Oct 06 2011 Remi Collet - 1.0.1-2 -- ZTS extension -- spec cleanups - -* Fri Jun 10 2011 Remi Collet - 1.0.1-1 -- Version 1.0.1 (stable) - API 1.0.1 (stable) -- run test suite after build - -* Wed Feb 09 2011 Fedora Release Engineering - 0.9.11-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Wed Jun 23 2010 Johan Cwiklinski 0.9.11-1 -- update to latest release - -* Thu May 13 2010 Johan Cwiklinski 0.9.10-2 -- consitent use of pecl_name macro -- add %%check -- fixes some typos -- thanks Remi :) - -* Thu May 13 2010 Johan Cwiklinski 0.9.10-1 -- update to latest release - -* Tue Apr 27 2010 Johan Cwiklinski 0.9.9-2 -- Add missing Requires -- Remove conditionnal 'php_zend_api' 'pecl_install' no longer required -- %%define no longer must be used -- Thanks to Remi :) - -* Mon Apr 26 2010 Johan Cwiklinski 0.9.9-1 -- Initial packaging diff --git a/php-pecl-solr2.spec b/php-pecl-solr2.spec index 162110c..72f9042 100644 --- a/php-pecl-solr2.spec +++ b/php-pecl-solr2.spec @@ -7,11 +7,13 @@ # # Please, preserve the changelog entries # +%{?scl: %scl_package php-pecl-solr2} %{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d} %{!?__pecl: %global __pecl %{_bindir}/pecl} %{!?__php: %global __php %{_bindir}/php} %global pecl_name solr +#global prever b %global with_zts 0%{?__ztsphp:1} %if "%{php_version}" < "5.6" # After curl, json @@ -23,41 +25,57 @@ Summary: Object oriented API to Apache Solr Summary(fr): API orientée objet pour Apache Solr -Name: php-pecl-solr2 +Name: %{?scl_prefix}php-pecl-solr2 Version: 2.0.0 -Release: 1%{?dist} +Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} License: PHP Group: Development/Languages URL: http://pecl.php.net/package/solr Source0: http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz -BuildRequires: php-devel -BuildRequires: php-pear -BuildRequires: php-curl -BuildRequires: php-json +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: %{?scl_prefix}php-devel +BuildRequires: %{?scl_prefix}php-pear +BuildRequires: %{?scl_prefix}php-curl +BuildRequires: %{?scl_prefix}php-json BuildRequires: curl-devel BuildRequires: libxml2-devel Requires(post): %{__pecl} Requires(postun): %{__pecl} -Requires: php(zend-abi) = %{php_zend_api} -Requires: php(api) = %{php_core_api} +Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} +Requires: %{?scl_prefix}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} +Requires: %{?scl_prefix}php-common%{?_isa} %else -Requires: php-curl%{?_isa} -Requires: php-json%{?_isa} +Requires: %{?scl_prefix}php-curl%{?_isa} +Requires: %{?scl_prefix}php-json%{?_isa} %endif -Provides: php-%{pecl_name} = %{version} -Provides: php-%{pecl_name}%{?_isa} = %{version} -Provides: php-pecl(%{pecl_name}) = %{version} -Provides: php-pecl(%{pecl_name})%{?_isa} = %{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} # Only one version of the extension -Conflicts: php-pecl-solr < 2 +Conflicts: %{?scl_prefix}php-pecl-solr < 2 + +%if "%{?vendor}" == "Remi Collet" +Obsoletes: php53-pecl-%{pecl_name}2 <= %{version} +Obsoletes: php53u-pecl-%{pecl_name}2 <= %{version} +Obsoletes: php54-pecl-%{pecl_name}2 <= %{version} +Obsoletes: php54w-pecl-%{pecl_name}2 <= %{version} +%if "%{php_version}" > "5.5" +Obsoletes: php55u-pecl-%{pecl_name}2 <= %{version} +Obsoletes: php55w-pecl-%{pecl_name}2 <= %{version} +%endif +%if "%{php_version}" > "5.6" +Obsoletes: php56u-pecl-%{pecl_name}2 <= %{version} +Obsoletes: php56w-pecl-%{pecl_name}2 <= %{version} +%endif +%endif %if 0%{?fedora} < 20 && 0%{?rhel} < 7 # Filter shared private @@ -132,6 +150,8 @@ make %{?_smp_mflags} %install +rm -rf %{buildroot} + make -C NTS install INSTALL_ROOT=%{buildroot} # Install XML package description @@ -145,6 +165,7 @@ make -C ZTS install INSTALL_ROOT=%{buildroot} install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name} %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}/%{pecl_name}/$i @@ -202,7 +223,12 @@ TEST_PHP_EXECUTABLE=%{__ztsphp} \ %endif +%clean +rm -rf %{buildroot} + + %files +%defattr(-, root, root, -) %doc %{pecl_docdir}/%{pecl_name} %doc %{pecl_testdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml @@ -219,7 +245,6 @@ TEST_PHP_EXECUTABLE=%{__ztsphp} \ %changelog * Tue Jun 24 2014 Remi Collet - 2.0.0-1 - update to 2.0.0 -- cleanup for review * Mon Jun 23 2014 Remi Collet - 2.0.0-0.4 - test build before 2.0.0 finale -- cgit