summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2012-08-15 10:34:12 +0200
committerRemi Collet <fedora@famillecollet.com>2012-08-15 10:34:12 +0200
commit60683360f336dd67c35bfed961fb77045de9e9b5 (patch)
treeddade0b7065e769f643bc9faa52b7e84ce78e8ef
parent2520f7297e156cc478113c5b1b2695696c467bf7 (diff)
php-pear: sync with rawhide
-rw-r--r--macros.pear4
-rw-r--r--php-pear.spec32
-rw-r--r--sources6
3 files changed, 27 insertions, 15 deletions
diff --git a/macros.pear b/macros.pear
index f55c079..deabb08 100644
--- a/macros.pear
+++ b/macros.pear
@@ -25,8 +25,8 @@
#
# Define XML directories to store package registration information:
#
-%pear_xmldir %{pear_phpdir}/.pkgxml
-%pecl_xmldir %{pecl_phpdir}/.pkgxml
+%pear_xmldir %{_localstatedir}/lib/pear/pkgxml
+%pecl_xmldir %{_localstatedir}/lib/pear/pkgxml
#
# Define macros to be used in scriplets for php-pecl-* spec files:
diff --git a/php-pear.spec b/php-pear.spec
index 50a32de..31e1a3b 100644
--- a/php-pear.spec
+++ b/php-pear.spec
@@ -14,10 +14,10 @@
Summary: PHP Extension and Application Repository framework
Name: php-pear
Version: 1.9.4
-Release: 9%{?dist}
+Release: 10%{?dist}
Epoch: 1
# PEAR, Archive_Tar, XML_Util are BSD
-# Console_Getopt are PHP
+# Console_Getopt is PHP
# Structures_Graph is LGPLv2+
License: BSD and PHP and LGPLv2+
Group: Development/Languages
@@ -97,7 +97,7 @@ export PHP_PEAR_TEMP_DIR=/var/tmp
install -d $RPM_BUILD_ROOT%{peardir} \
$RPM_BUILD_ROOT%{_localstatedir}/cache/php-pear \
$RPM_BUILD_ROOT%{_localstatedir}/www/html \
- $RPM_BUILD_ROOT%{peardir}/.pkgxml \
+ $RPM_BUILD_ROOT%{_localstatedir}/lib/pear/pkgxml \
$RPM_BUILD_ROOT%{_sysconfdir}/rpm \
$RPM_BUILD_ROOT%{_sysconfdir}/pear
@@ -110,6 +110,7 @@ export INSTALL_ROOT=$RPM_BUILD_ROOT
--bin %{_bindir} \
--www %{_localstatedir}/www/html \
--doc %{_docdir}/pear \
+ --test %{_datarootdir}/tests/pear \
%{SOURCE0} %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE24}
# Replace /usr/bin/* with simple scripts:
@@ -140,7 +141,7 @@ popd
rm -rf $RPM_BUILD_ROOT/.depdb* $RPM_BUILD_ROOT/.lock $RPM_BUILD_ROOT/.channels $RPM_BUILD_ROOT/.filemap
# Need for re-registrying XML_Util
-install -m 644 XML_Util.xml $RPM_BUILD_ROOT%{peardir}/.pkgxml/
+install -m 644 XML_Util.xml $RPM_BUILD_ROOT%{_localstatedir}/lib/pear/pkgxml
%check
@@ -175,9 +176,16 @@ rm -rf $RPM_BUILD_ROOT
rm new-pear.conf
+%post
+# force new value as pear.conf is (noreplace)
+%{_bindir}/pear config-set test_dir \
+ %{_datarootdir}/tests/pear system >/dev/null || :
+
+
%triggerpostun -- php-pear-XML-Util
# re-register extension unregistered during postun of obsoleted php-pear-XML-Util
-%{_bindir}/pear install --nodeps --soft --force --register-only %{pear_xmldir}/XML_Util.xml >/dev/null || :
+%{_bindir}/pear install --nodeps --soft --force --register-only \
+ %{_localstatedir}/lib/pear/pkgxml/XML_Util.xml >/dev/null || :
%files
@@ -192,11 +200,21 @@ rm new-pear.conf
%doc README* LICENSE*
%dir %{_docdir}/pear
%doc %{_docdir}/pear/*
-#dir %{_datarootdir}/tests
-#{_datarootdir}/tests/pear
+%dir %{_datarootdir}/tests
+%{_datarootdir}/tests/pear
+%{_localstatedir}/lib/pear
%changelog
+* Tue Aug 15 2012 Remi Collet <remi@fedoraproject.org> 1:1.9.4-10
+- enforce test_dir on update
+
+* Mon Aug 13 2012 Remi Collet <remi@fedoraproject.org> 1:1.9.4-9
+- move tests to /usr/share/tests/pear
+- move pkgxml to /var/lib/pear
+- remove XML_RPC
+- refresh installer
+
* Mon Aug 13 2012 Remi Collet <remi@fedoraproject.org> 1:1.9.4-9
- remove XML_RPC
diff --git a/sources b/sources
deleted file mode 100644
index 9365117..0000000
--- a/sources
+++ /dev/null
@@ -1,6 +0,0 @@
-a40b15b38ef8a5239309c9faedfa123b Archive_Tar-1.3.7.tgz
-d8e9e8e5efc5a4afdc7e62b294b2655e Console_Getopt-1.3.0.tgz
-e301d2d81371327a96864a307b85509d PEAR-1.9.1.tgz
-b99c5e9ac348a2e81515ba16deb7ded3 Structures_Graph-1.0.4.tgz
-da0d1c21960a67bc76629db28d2c7755 XML_RPC-1.5.4.tgz
-b8d4efcdb11b308b179f7bb63043284f XML_Util-1.2.1.tgz