From 6e7675152d7f67e82b1962acb3b987403957dc30 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 2 Jan 2014 16:13:59 +0100 Subject: php-pecl-xmldiff: adapt for SCL --- php-pecl-xmldiff.spec | 73 ++++++++++++++++++++++++++++++++++----------------- 1 file changed, 49 insertions(+), 24 deletions(-) diff --git a/php-pecl-xmldiff.spec b/php-pecl-xmldiff.spec index 6c4c56b..0c30403 100644 --- a/php-pecl-xmldiff.spec +++ b/php-pecl-xmldiff.spec @@ -6,6 +6,7 @@ # # Please, preserve the changelog entries # +%{?scl: %scl_package php-pecl-xmldiff} %{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d} %{!?php_incldir: %global php_incldir %{_includedir}/php} %{!?__pecl: %global __pecl %{_bindir}/pecl} @@ -15,39 +16,51 @@ %global pecl_name xmldiff Summary: XML diff and merge -Name: php-pecl-%{pecl_name} +Name: %{?scl_prefix}php-pecl-%{pecl_name} Version: 0.9.2 -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: BSD Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: php-devel > 5.3 -BuildRequires: php-pear -BuildRequires: php-dom -BuildRequires: php-libxml +BuildRequires: %{?scl_prefix}php-devel > 5.3 +BuildRequires: %{?scl_prefix}php-pear +BuildRequires: %{?scl_prefix}php-dom +BuildRequires: %{?scl_prefix}php-libxml BuildRequires: diffmark-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 requires the real package instead -Requires: php-xml%{?_isa} +Requires: %{?scl_prefix}php-xml%{?_isa} %else -Requires: php-dom%{?_isa} -Requires: php-libxml%{?_isa} +Requires: %{?scl_prefix}php-dom%{?_isa} +Requires: %{?scl_prefix}php-libxml%{?_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} + +%if 0%{!?scl:1} +# Other third party repo stuff +%if "%{php_version}" > "5.4" +Obsoletes: php53-pecl-%{pecl_name} +Obsoletes: php53u-pecl-%{pecl_name} +Obsoletes: php54-pecl-%{pecl_name} +%endif +%if "%{php_version}" > "5.5" +Obsoletes: php55u-pecl-%{pecl_name} +%endif +%endif %if 0%{?fedora} < 20 # Filter shared private @@ -66,7 +79,7 @@ objects, local files and strings in memory can be processed. Summary: %{name} developer files (header) Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: php-devel%{?_isa} +Requires: %{?scl_prefix}php-devel%{?_isa} Requires: libxml2-devel%{?_isa} %description devel @@ -122,8 +135,7 @@ make %{?_smp_mflags} %install rm -rf %{buildroot} -make -C NTS \ - install INSTALL_ROOT=%{buildroot} +make -C NTS install INSTALL_ROOT=%{buildroot} # install config file install -D -m 644 %{pecl_name}.ini %{buildroot}%{php_inidir}/%{pecl_name}.ini @@ -132,12 +144,19 @@ install -D -m 644 %{pecl_name}.ini %{buildroot}%{php_inidir}/%{pecl_name}.ini install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml %if %{with_zts} -make -C ZTS \ - install INSTALL_ROOT=%{buildroot} +make -C ZTS install INSTALL_ROOT=%{buildroot} install -D -m 644 %{pecl_name}.ini %{buildroot}%{php_ztsinidir}/%{pecl_name}.ini %endif +# Test & Documentation +for i in $(grep 'role="doc"' package.xml | sed -e 's/^.*name="//;s/".*$//' | grep -v ^diffmark) +do install -Dpm 644 NTS/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i +done +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 + %post %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || : @@ -152,7 +171,7 @@ fi %check cd NTS # Minimal load test for NTS extension -php --no-php-ini \ +%{__php} --no-php-ini \ --define extension=dom.so \ --define extension=modules/%{pecl_name}.so \ --modules | grep %{pecl_name} @@ -162,7 +181,7 @@ TEST_PHP_EXECUTABLE=%{_bindir}/php \ TEST_PHP_ARGS="-n -d extension=dom.so -d extension=$PWD/modules/%{pecl_name}.so" \ NO_INTERACTION=1 \ REPORT_EXIT_STATUS=1 \ -%{_bindir}/php -n run-tests.php +%{__php} -n run-tests.php %if %{with_zts} cd ../ZTS @@ -187,7 +206,7 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc NTS/{CREDITS,LICENSE} +%doc %{pecl_docdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml %config(noreplace) %{php_inidir}/%{pecl_name}.ini %{php_extdir}/%{pecl_name}.so @@ -199,6 +218,7 @@ rm -rf %{buildroot} %files devel %defattr(-,root,root,-) +%doc %{pecl_testdir}/%{pecl_name} %{php_incldir}/ext/%{pecl_name} %if %{with_zts} @@ -207,7 +227,12 @@ rm -rf %{buildroot} %changelog -* Wed Jan 01 2014 Remi Collet - 0.9.2-1 +* Thu Jan 2 2014 Remi Collet - 0.9.2-2 +- adapt for SCL +- doc in pecl_docdir +- tests in pecl_test_dir (devel) + +* Wed Jan 1 2014 Remi Collet - 0.9.2-1 - Update to 0.9.2 (stable) * Sat Nov 02 2013 Remi Collet - 0.9.1-1 -- cgit