[php-pear] set pecl test_dir to /usr/share/tests/pecl

Remi Collet remi at fedoraproject.org
Tue Oct 15 04:02:52 UTC 2013


commit a1340cf3bd936d5ecad771de7127a48f915349b5
Author: Remi Collet <remi at fedoraproject.org>
Date:   Tue Oct 15 06:02:35 2013 +0200

     set pecl test_dir to /usr/share/tests/pecl

 php-pear.spec |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)
---
diff --git a/php-pear.spec b/php-pear.spec
index e30eae4..670335f 100644
--- a/php-pear.spec
+++ b/php-pear.spec
@@ -15,7 +15,7 @@
 Summary: PHP Extension and Application Repository framework
 Name: php-pear
 Version: 1.9.4
-Release: 22%{?dist}
+Release: 23%{?dist}
 Epoch: 1
 # PEAR, Archive_Tar, XML_Util are BSD
 # Console_Getopt is PHP
@@ -130,8 +130,8 @@ install -d $RPM_BUILD_ROOT%{peardir} \
            $RPM_BUILD_ROOT%{_localstatedir}/www/html \
            $RPM_BUILD_ROOT%{_localstatedir}/lib/pear/pkgxml \
            $RPM_BUILD_ROOT%{_sysconfdir}/rpm \
-           $RPM_BUILD_ROOT%{_docdir}/pear \
            $RPM_BUILD_ROOT%{_docdir}/pecl \
+           $RPM_BUILD_ROOT%{_datadir}/tests/pecl \
            $RPM_BUILD_ROOT%{_sysconfdir}/pear
 
 export INSTALL_ROOT=$RPM_BUILD_ROOT
@@ -257,6 +257,14 @@ if [ "$current" != "%{_docdir}/pecl" ]; then
     system >/dev/null || :
 fi
 
+current=$(%{_bindir}/pear config-get -c pecl test_dir system)
+if [ "$current" != "%{_datadir}/tests/pecl" ]; then
+%{_bindir}/pear config-set \
+    -c pecl \
+    test_dir %{_datadir}/tests/pecl \
+    system >/dev/null || :
+fi
+
 
 %triggerpostun -- php-pear-XML-Util
 # re-register extension unregistered during postun of obsoleted php-pear-XML-Util
@@ -286,6 +294,7 @@ fi
 %doc %{_docdir}/pear/*
 %dir %{_docdir}/pecl
 %dir %{_datadir}/tests
+%dir %{_datadir}/tests/pecl
 %{_datadir}/tests/pear
 %{_datadir}/pear-data
 %{_mandir}/man1/pear.1*
@@ -295,6 +304,9 @@ fi
 
 
 %changelog
+* Tue Oct 15 2013 Remi Collet <rcollet at redhat.com> 1:1.9.4-23
+- set pecl test_dir to /usr/share/tests/pecl
+
 * Mon Oct 14 2013 Remi Collet <rcollet at redhat.com> 1:1.9.4-22
 - set pecl doc_dir to /usr/share/doc/pecl
 


More information about the scm-commits mailing list