rpms/php-pear-Net-FTP/devel Net_FTP-1.3.7-test.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 php-pear-Net-FTP.spec, 1.5, 1.6 sources, 1.5, 1.6
Remi Collet (remi)
fedora-extras-commits at redhat.com
Tue May 20 15:42:38 UTC 2008
Author: remi
Update of /cvs/extras/rpms/php-pear-Net-FTP/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14908
Modified Files:
.cvsignore php-pear-Net-FTP.spec sources
Added Files:
Net_FTP-1.3.7-test.patch
Log Message:
update to 1.3.7
Net_FTP-1.3.7-test.patch:
--- NEW FILE Net_FTP-1.3.7-test.patch ---
--- Net_FTPTest.php 2008/05/19 18:08:23 1.7.2.5
+++ Net_FTPTest.php 2008/05/20 07:59:07 1.7.2.6
@@ -26,7 +26,7 @@
* @author Tobias Schlitt <toby at php.net>
* @copyright 1997-2008 The PHP Group
* @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version CVS: $Id: Net_FTPTest.php,v 1.7.2.5 2008/05/19 18:08:23 jschippers Exp $
+ * @version CVS: $Id: Net_FTPTest.php,v 1.7.2.6 2008/05/20 07:59:07 jschippers Exp $
* @link http://pear.php.net/package/Net_FTP
* @link http://www.phpunit.de PHPUnit
* @since File available since Release 1.3.3
@@ -274,7 +274,7 @@
$this->assertFalse(PEAR::isError($dirlist));
$dirlist = $this->_getNames($dirlist);
- $dirlistok = array($this->_getLastPart($tmpfile[$i]), '.', '..');
+ $dirlistok = array($this->_getLastPart($tmpfile[$i]));
if ($i < 2) {
$dirlistok[] = $this->_getLastPart($tmpdir[$i+1]);
}
@@ -408,7 +408,7 @@
}
/**
- * Return all name keys in the elements of an array
+ * Return all name keys in the elements of an array, leaving out . and ..
*
* @param array $in Multidimensional array
*
@@ -418,7 +418,9 @@
{
$return = array();
foreach ($in as $v) {
- $return[] = $v['name'];
+ if ($v['name'] != '.' && $v['name'] != '..') {
+ $return[] = $v['name'];
+ }
}
return $return;
}
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Net-FTP/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 17 May 2008 07:31:38 -0000 1.5
+++ .cvsignore 20 May 2008 15:41:43 -0000 1.6
@@ -1 +1 @@
-Net_FTP-1.3.6.tgz
+Net_FTP-1.3.7.tgz
Index: php-pear-Net-FTP.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Net-FTP/devel/php-pear-Net-FTP.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- php-pear-Net-FTP.spec 17 May 2008 07:31:38 -0000 1.5
+++ php-pear-Net-FTP.spec 20 May 2008 15:41:43 -0000 1.6
@@ -2,7 +2,7 @@
%define pear_name Net_FTP
Name: php-pear-Net-FTP
-Version: 1.3.6
+Version: 1.3.7
Release: 1%{?dist}
Summary: Provides an OO interface to the PHP FTP functions plus some additions
@@ -10,6 +10,11 @@
License: PHP
URL: http://pear.php.net/package/Net_FTP
Source0: http://pear.php.net/get/%{pear_name}-%{version}.tgz
+
+# See http://pear.php.net/bugs/bug.php?id=13946
+# Get http://cvs.php.net/viewvc.cgi/pear/Net_FTP/tests/Net_FTPTest.php?r1=1.7.2.5&r2=1.7.2.6&view=patch
+Patch0: %{pear_name}-1.3.7-test.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -27,6 +32,7 @@
downloading, dircreation and chmodding. It although implements an observer
pattern to allow for example the view of a progress bar.
+
%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
@@ -47,8 +53,9 @@
# Move documentation
mv $RPM_BUILD_ROOT%{pear_docdir}/%{pear_name} ../docdir
-# Fix rpmlint warnings
-dos2unix ../docdir/example/observer.php
+
+# Fix wrong-file-end-of-line-encoding
+dos2unix ../docdir/example/* CHANGELOG
# Clean up unnecessary files
@@ -58,6 +65,11 @@
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
+# Patch applied here (don't break checksum control during install)
+cd $RPM_BUILD_ROOT%{pear_testdir}/Net_FTP
+dos2unix Net_FTPTest.php
+patch -p0 <%{PATCH0}
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -86,14 +98,19 @@
%check
# yum install php-pear-Net-FTP
-# yum install php-pear-PHPUnit # (tested with 3.1.8)
+# yum install php-pear-PHPUnit # (tested with 3.2.15)
# cd /usr/share/pear/test/Net_FTP
# cp config.php.dist config.php
# vi config.php
# php AllTests.php
-# should display : OK (8 tests)
+# should display : OK (9 tests)
+
%changelog
+* Tue May 20 2008 Remi Collet <Fedora at FamilleCollet.com> 1.3.7-1
+- new version
+- add Net_FTP-1.3.7-test.patch for test suite (from CVS)
+
* Thu May 08 2008 Remi Collet <Fedora at FamilleCollet.com> 1.3.6-1
- new version
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Net-FTP/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 17 May 2008 07:31:38 -0000 1.5
+++ sources 20 May 2008 15:41:43 -0000 1.6
@@ -1 +1 @@
-17f2e00992665ef03109f87166ab79d9 Net_FTP-1.3.6.tgz
+72ad889ed9ee1684592315a236c363f5 Net_FTP-1.3.7.tgz
More information about the scm-commits
mailing list