From 0b5f321d0a3ae25dac8306c175b9e7bfc6b3de89 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 17 Mar 2014 11:49:12 +0100 Subject: php-pecl-leveldb: cleanups --- php-pecl-leveldb.spec | 46 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 34 insertions(+), 12 deletions(-) diff --git a/php-pecl-leveldb.spec b/php-pecl-leveldb.spec index 0a6041b..3bb2102 100644 --- a/php-pecl-leveldb.spec +++ b/php-pecl-leveldb.spec @@ -15,7 +15,7 @@ Summary: LevelDB PHP bindings Name: php-pecl-%{pecl_name} Version: 0.1.4 -Release: 1%{?dist} +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} @@ -45,6 +45,19 @@ Provides: php-%{pecl_name}%{?_isa} = %{version} Provides: php-pecl(%{pecl_name}) = %{version} Provides: php-pecl(%{pecl_name})%{?_isa} = %{version} +%if "%{?vendor}" == "Remi Collet" +# Other third party repo stuff +Obsoletes: php53-pecl-%{pecl_name} +Obsoletes: php53u-pecl-%{pecl_name} +Obsoletes: php54-pecl-%{pecl_name} +%if "%{php_version}" > "5.5" +Obsoletes: php55u-pecl-%{pecl_name} +%endif +%if "%{php_version}" > "5.6" +Obsoletes: php56u-pecl-%{pecl_name} +%endif +%endif + %if 0%{?fedora} < 20 && 0%{?rhel} < 7 # Filter shared private %{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$} @@ -62,7 +75,7 @@ mv %{pecl_name}-%{version} NTS cd NTS -cp %{SOURCE1} . +cp %{SOURCE1} LICENSE %patch0 -p0 -b .libdir # Sanity check, really often broken @@ -106,8 +119,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 @@ -116,12 +128,18 @@ 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="test"' package.xml | sed -e 's/^.*name="//;s/".*$//') +do install -Dpm 644 NTS/$i %{buildroot}%{pecl_testdir}/%{pecl_name}/$i +done +for i in LICENSE $(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 || : @@ -137,8 +155,7 @@ fi : Minimal load test for NTS extension cd NTS php --no-php-ini \ - --define extension_dir=modules \ - --define extension=%{pecl_name}.so \ + --define extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \ --modules | grep %{pecl_name} : Upstream test suite for NTS extension @@ -152,8 +169,7 @@ REPORT_EXIT_STATUS=0 \ : Minimal load test for ZTS extension cd ../ZTS %{__ztsphp} --no-php-ini \ - --define extension_dir=modules \ - --define extension=%{pecl_name}.so \ + --define extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \ --modules | grep %{pecl_name} : Upstream test suite for ZTS extension @@ -171,8 +187,10 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc NTS/{LICENSE,README.md} +%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 @@ -183,5 +201,9 @@ rm -rf %{buildroot} %changelog +* Mon Mar 17 2014 Remi Collet - 0.1.4-2 +- install doc in pecl_docdir +- install tests in pecl_testdir + * Sat Aug 24 2013 Remi Collet - 0.1.4-1 - initial package -- cgit