[php-pear-Math-Stats] update to 0.9.0 + run test duing %check
Remi Collet
remi at fedoraproject.org
Sun Oct 3 18:07:30 UTC 2010
commit 2de74218293b6dccf1584d12f77515cc76772112
Author: remi <fedora at famillecollet.com>
Date: Sun Oct 3 20:07:29 2010 +0200
update to 0.9.0 + run test duing %check
php-pear-Math-Stats-freq.patch | 33 ++++++++++++++++++++++++++
php-pear-Math-Stats.spec | 50 ++++++++++++++++++++++++++++------------
2 files changed, 68 insertions(+), 15 deletions(-)
---
diff --git a/php-pear-Math-Stats-freq.patch b/php-pear-Math-Stats-freq.patch
new file mode 100644
index 0000000..c8ea8f6
--- /dev/null
+++ b/php-pear-Math-Stats-freq.patch
@@ -0,0 +1,33 @@
+diff -up Math_Stats-0.9.0/Math/Stats.php.orig Math_Stats-0.9.0/Math/Stats.php
+--- Math_Stats-0.9.0/Math/Stats.php.orig 2010-10-03 20:00:07.000000000 +0200
++++ Math_Stats-0.9.0/Math/Stats.php 2010-10-03 20:00:09.000000000 +0200
+@@ -1213,14 +1213,10 @@ class Math_Stats {/*{{{*/
+ } else {
+ $freq = array();
+ foreach ($this->_data as $val) {
+- if (isset($freq[$val])) {
+- if (!isset($freq["$val"])) {
+- $freq["$val"] = 0;
+- }
+- $freq["$val"]++;
+- } else {
+- $freq["$val"] = 1;
++ if (!isset($freq["$val"])) {
++ $freq["$val"] = 0;
+ }
++ $freq["$val"]++;
+ }
+ ksort($freq);
+ }
+diff -up Math_Stats-0.9.0/php-pear-Math-Stats.xml.orig Math_Stats-0.9.0/php-pear-Math-Stats.xml
+--- Math_Stats-0.9.0/php-pear-Math-Stats.xml.orig 2010-10-03 20:00:22.000000000 +0200
++++ Math_Stats-0.9.0/php-pear-Math-Stats.xml 2010-10-03 20:01:00.000000000 +0200
+@@ -44,7 +44,7 @@ Bug #12465 Median formula incorrect
+ <file baseinstalldir="/" md5sum="80fe164540c65e39540353036791f8dc" name="docs/examples/ex_stats_bigdataset.php" role="doc" />
+ <file baseinstalldir="/" md5sum="86259102f97ff924467a7f3b64208556" name="docs/examples/ex_stats_cummulative_data.php" role="doc" />
+ <file baseinstalldir="/" md5sum="6cb955d576053cc06af03aa235698d3b" name="docs/examples/ex_stats_simple.php" role="doc" />
+- <file baseinstalldir="/" md5sum="72b9228e127657482e87289b6dcbb6e8" name="Math/Stats.php" role="php" />
++ <file baseinstalldir="/" md5sum="b0655103861cbf47c09e7d27c1230d11" 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="/" md5sum="91ef36bc4f148b912f7922720905d5a9" name="tests/test_Math_Stats_instance_methods-data.php" role="test" />
diff --git a/php-pear-Math-Stats.spec b/php-pear-Math-Stats.spec
index 8f86880..6affe28 100644
--- a/php-pear-Math-Stats.spec
+++ b/php-pear-Math-Stats.spec
@@ -1,20 +1,25 @@
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%global pear_name Math_Stats
-%global beta beta3
+#global beta beta3
Name: php-pear-Math-Stats
Version: 0.9.0
-Release: 0.5.%{beta}%{?dist}
+Release: 1%{?dist}
Summary: Classes to calculate statistical parameters
Group: Development/Libraries
License: PHP
URL: http://pear.php.net/package/Math_Stats
-Source0: http://pear.php.net/get/%{pear_name}-%{version}%{beta}.tgz
+Source0: http://pear.php.net/get/%{pear_name}-%{version}%{?beta}.tgz
+
+# see https://pear.php.net/bugs/17924
+Patch0: %{name}-freq.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: php-pear >= 1:1.4.9-1.2
+# For test suite
+BuildRequires: php-pear(pear.phpunit.de/PHPUnit)
Requires: php-pear(PEAR)
Requires(post): %{__pear}
@@ -35,29 +40,30 @@ array item, e.g. $data = array(3=>4, 2.3=>5, 1.25=>6, 0.5=>3).
cp /etc/php.ini .
echo "date.timezone=UTC" >>php.ini
-cd %{pear_name}-%{version}%{beta}
-# package.xml is V1
-PHPRC=../php.ini %{__pear} convert ../package.xml %{name}.xml
+cd %{pear_name}-%{version}%{?beta}
+# package.xml is V2
+mv ../package.xml %{name}.xml
+
+%patch0 -p1
%build
-cd %{pear_name}-%{version}%{beta}
+cd %{pear_name}-%{version}%{?beta}
# Empty build section, most likely nothing required.
%install
-cd %{pear_name}-%{version}%{beta}
-rm -rf $RPM_BUILD_ROOT docdir
+rm -rf $RPM_BUILD_ROOT docdir contrib
+cd %{pear_name}-%{version}%{?beta}
PHPRC=../php.ini %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
# Move documentation
mkdir -p docdir
-mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir
-mv $RPM_BUILD_ROOT%{pear_phpdir}/Math/examples docdir/%{pear_name}
+mv $RPM_BUILD_ROOT%{pear_docdir}/%{pear_name} ../docdir
+mv $RPM_BUILD_ROOT%{pear_phpdir}/contrib ../contrib
+mv $RPM_BUILD_ROOT%{pear_phpdir}/data/Math_Stats/contrib/ignatius_reilly/msg.txt ../contrib/ignatius_reilly
+
-# Move test files into testdir
-mkdir -p $RPM_BUILD_ROOT%{pear_testdir}
-mv $RPM_BUILD_ROOT%{pear_phpdir}/Math/test $RPM_BUILD_ROOT%{pear_testdir}/%{pear_name}
# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
@@ -67,6 +73,14 @@ mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
+%check
+cd %{pear_name}-%{version}
+%{_bindir}/phpunit \
+ -d date.timezone=UTC \
+ -d include_path=$RPM_BUILD_ROOT%{pear_phpdir}:%{pear_phpdir} \
+ tests
+
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -84,13 +98,19 @@ fi
%files
%defattr(-,root,root,-)
-%doc %{pear_name}-%{version}%{beta}/docdir/%{pear_name}/*
+%doc docdir/docs/* contrib
%{pear_xmldir}/%{name}.xml
%{pear_testdir}/%{pear_name}
%{pear_phpdir}/Math
%changelog
+* Sat Oct 02 2010 Remi Collet <Fedora at FamilleCollet.com> - 0.9.0-1
+- upstream 0.9.0
+- package.xml is now V2
+- patch for https://pear.php.net/bugs/17924
+- run phpunit during %%check
+
* Sat Aug 28 2010 Remi Collet <Fedora at FamilleCollet.com> - 0.9.0-0.5.beta3
- clean define
- remove LICENSE (not provided by upstream)
More information about the scm-commits
mailing list