rpms/php-pear
7
0
Fork 0
Code Issues Pull Requests Releases Activity

update to 1.6.2

Browse Source
This commit is contained in:
Remi Collet 2007-09-09 19:35:42 +00:00
parent e05e7ead7b
commit 6fb06dce41
5 changed files with 13 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1,4 +1,4 @@
PEAR-1.6.1.tgz
PEAR-1.6.2.tgz
XML_RPC-1.5.1.tgz
Archive_Tar-1.3.2.tgz
Console_Getopt-1.2.3.tgz

15
pear-downloaddir.patch
View File

@ -1,15 +0,0 @@
To avoid error on when "system" download_dir is not writable for normal user.
See : http://pear.php.net/bugs/bug.php?id=11517
--- /usr/share/pear/PEAR/Downloader.php.orig 2007-07-15 12:35:38.000000000 +0200
+++ /usr/share/pear/PEAR/Downloader.php 2007-07-15 12:34:59.000000000 +0200
@@ -679,7 +679,7 @@
return $this->_downloadDir;
}
$downloaddir = $this->config->get('download_dir');
- if (empty($downloaddir)) {
+ if (empty($downloaddir) || (is_dir($downloaddir) && !is_writable($downloaddir))) {
if (!class_exists('System')) {
require_once 'System.php';
}

24
pear-peclinstall.patch
View File

@ -1,24 +0,0 @@
To Avoid warnings when using pecl (un)install command
See : http://pear.php.net/bugs/bug.php?id=11420
--- /usr/share/pear/PEAR/Command/Install.php.orig 2007-06-24 13:22:19.000000000 +0200
+++ /usr/share/pear/PEAR/Command/Install.php 2007-06-24 13:30:28.000000000 +0200
@@ -700,7 +700,7 @@
break;
}
}
- foreach ($binaries as $pinfo) {
+ if (isset($binaries)) foreach ($binaries as $pinfo) {
PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
$ret = $this->enableExtension(array($pinfo[0]), $param->getPackageType());
PEAR::staticPopErrorHandling();
@@ -941,7 +941,7 @@
break;
}
}
- foreach ($binaries as $pinfo) {
+ if (isset($binaries)) foreach ($binaries as $pinfo) {
PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
$ret = $this->disableExtension(array($pinfo[0]), $pkg->getPackageType());
PEAR::staticPopErrorHandling();

22
php-pear.spec
View File

@ -12,8 +12,8 @@
Summary: PHP Extension and Application Repository framework
Name: php-pear
Version: 1.6.1
Release: 2
Version: 1.6.2
Release: 1%{?dist}
Epoch: 1
License: PHP
Group: Development/Languages
@ -33,13 +33,6 @@ Source21: http://pear.php.net/get/Archive_Tar-%{arctarver}.tgz
Source22: http://pear.php.net/get/Console_Getopt-%{getoptver}.tgz
Source23: http://pear.php.net/get/Structures_Graph-%{structver}.tgz
# To Avoid warnings when using pecl (un)install command
# see http://pear.php.net/bugs/bug.php?id=11420
Patch0: pear-peclinstall.patch
# To avoid error when "system" download_dir is not writable for normal user.
# see http://pear.php.net/bugs/bug.php?id=11517
Patch1: pear-downloaddir.patch
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: php-cli >= 5.1.0-1, php-xml, gnupg
@ -63,6 +56,8 @@ do
tar xzf $archive --strip-components 1
done
# apply patches on used PEAR during install
# -- no patch
%build
# This is an empty build section.
@ -109,9 +104,9 @@ install -m 644 -c %{SOURCE4} LICENSE
install -m 644 -c %{SOURCE13} \
$RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.pear
# apply patches on installed PEAR tree
cd $RPM_BUILD_ROOT%{peardir}
patch -p4 <%{PATCH0}
patch -p4 <%{PATCH1}
# -- no patch
# Why this file here ?
rm -rf $RPM_BUILD_ROOT/.depdb* $RPM_BUILD_ROOT/.lock $RPM_BUILD_ROOT/.channels $RPM_BUILD_ROOT/.filemap
@ -139,6 +134,11 @@ rm new-pear.conf
%doc LICENSE
%changelog
* Sun Sep 9 2007 Remi Collet <Fedora@FamilleCollet.com> 1:1.6.2-1
- update to 1.6.2
- remove patches merged upstream
- Fix : "pear install" hangs on non default channel (#283401)
* Tue Aug 21 2007 Joe Orton <jorton@redhat.com> 1:1.6.1-2
- fix License

2
sources
View File

@ -1,4 +1,4 @@
1476f0ec3917d68e3d7af1346a9a7b89 PEAR-1.6.1.tgz
8658f584d0ba2648b795fe8b1d8998c2 PEAR-1.6.2.tgz
1b516162ad65971b5fd04a7c279627ec XML_RPC-1.5.1.tgz
17d49e837b64df4e8f9124f829b22cd1 Archive_Tar-1.3.2.tgz
d7618327f9302a7191893768982de823 Console_Getopt-1.2.3.tgz