[php-pear-Math-Stats] fix FTBFS, update tests suite from git
Remi Collet
remi at fedoraproject.org
Mon Jan 16 10:54:12 UTC 2012
commit d74c29f184d6b923c6f7a42947d624a741590413
Author: remi <fedora at famillecollet.com>
Date: Mon Jan 16 11:53:45 2012 +0100
fix FTBFS, update tests suite from git
.gitignore | 4 ++--
Math_Stats-git.patch | 24 ++++++++++++++++++++++++
php-pear-Math-Stats.spec | 11 ++++++++++-
3 files changed, 36 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a2d58f5..5be646e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-Math_Stats-0.9.0beta3.tgz
-package.xml
+*spec~
+package-*.xml
/Math_Stats-0.9.0.tgz
/Math_Stats-0.9.1.tgz
diff --git a/Math_Stats-git.patch b/Math_Stats-git.patch
new file mode 100644
index 0000000..f0cec18
--- /dev/null
+++ b/Math_Stats-git.patch
@@ -0,0 +1,24 @@
+diff -up Math_Stats-0.9.1/php-pear-Math-Stats.xml.orig Math_Stats-0.9.1/php-pear-Math-Stats.xml
+--- Math_Stats-0.9.1/php-pear-Math-Stats.xml.orig 2012-01-16 11:46:30.000000000 +0100
++++ Math_Stats-0.9.1/php-pear-Math-Stats.xml 2012-01-16 11:47:45.000000000 +0100
+@@ -42,7 +42,7 @@ Bug #17924 frequency and test suite bro
+ <file baseinstalldir="/" md5sum="6cb955d576053cc06af03aa235698d3b" name="docs/examples/ex_stats_simple.php" role="doc" />
+ <file baseinstalldir="/" md5sum="38375662888986b7f75b913f286d0f92" name="Math/Stats.php" role="php" />
+ <file baseinstalldir="/" md5sum="e94fcc731b9f0b9d37e8a97149a860d9" name="tests/AllTests.php" role="test" />
+- <file baseinstalldir="/" md5sum="615133f4091f431f07151fd55f2b9646" name="tests/Math_StatsTest.php" role="test" />
++ <file baseinstalldir="/" name="tests/Math_StatsTest.php" role="test" />
+ <file baseinstalldir="/" md5sum="91ef36bc4f148b912f7922720905d5a9" name="tests/test_Math_Stats_instance_methods-data.php" role="test" />
+ </dir>
+ </contents>
+diff -up Math_Stats-0.9.1/tests/Math_StatsTest.php.orig Math_Stats-0.9.1/tests/Math_StatsTest.php
+--- Math_Stats-0.9.1/tests/Math_StatsTest.php.orig 2012-01-16 11:46:54.000000000 +0100
++++ Math_Stats-0.9.1/tests/Math_StatsTest.php 2012-01-16 11:47:24.000000000 +0100
+@@ -25,7 +25,7 @@
+ * @package Math_Stats
+ */
+
+-require_once 'PHPUnit/Framework.php';
++require_once 'PHPUnit/Framework/TestCase.php';
+ require_once 'Math/Stats.php';
+ require_once 'test_Math_Stats_instance_methods-data.php';
+
diff --git a/php-pear-Math-Stats.spec b/php-pear-Math-Stats.spec
index c9d69f5..679f639 100644
--- a/php-pear-Math-Stats.spec
+++ b/php-pear-Math-Stats.spec
@@ -4,7 +4,7 @@
Name: php-pear-Math-Stats
Version: 0.9.1
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Classes to calculate statistical parameters
Group: Development/Libraries
@@ -12,6 +12,9 @@ License: PHP
URL: http://pear.php.net/package/Math_Stats
Source0: http://pear.php.net/get/%{pear_name}-%{version}%{?beta}.tgz
+# https://github.com/pear/Math_Stats/commit/891a6413c30301fad711bb8aedba4f79dc87f46a
+Patch1: Math_Stats-git.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: php-pear >= 1:1.4.9-1.2
@@ -38,6 +41,9 @@ cd %{pear_name}-%{version}%{?beta}
# package.xml is V2
sed -e '/contrib/s/role=".*"/role="doc"/' <../package.xml >%{name}.xml
+%patch1 -p1 -b .orig
+
+
%build
cd %{pear_name}-%{version}%{?beta}
# Empty build section, most likely nothing required.
@@ -88,6 +94,9 @@ fi
%changelog
+* Mon Jan 16 2012 Remi Collet <remi at fedoraproject.org> - 0.9.1-6
+- fix from GIT for test suite
+
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
More information about the scm-commits
mailing list