[php-pear-Math-Stats/el6/master] update to 0.9.1

Remi Collet remi at fedoraproject.org
Mon Oct 4 18:35:56 UTC 2010


commit 4744c37240fb4a467db91e088cb0eddff9554777
Author: remi <fedora at famillecollet.com>
Date:   Mon Oct 4 20:35:58 2010 +0200

    update to 0.9.1

 php-pear-Math-Stats.spec |   46 ++++++++++++++++++++++++++++++----------------
 sources                  |    2 +-
 2 files changed, 31 insertions(+), 17 deletions(-)
---
diff --git a/php-pear-Math-Stats.spec b/php-pear-Math-Stats.spec
index 8f86880..ac7a206 100644
--- a/php-pear-Math-Stats.spec
+++ b/php-pear-Math-Stats.spec
@@ -1,20 +1,22 @@
 %{!?__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}
+Version:        0.9.1
+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
 
 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 +37,28 @@ 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 
 
 
 %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 +68,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 +93,18 @@ 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
+* Mon Oct 04 2010 Remi Collet <Fedora at FamilleCollet.com> - 0.9.1-1
+- upstream 0.9.1 
+- package.xml is now V2
+- 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)
diff --git a/sources b/sources
index 3596e17..424b016 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ffc0b653e5e2985113262a5299ebe69b  Math_Stats-0.9.0beta3.tgz
+afb06c6975bd1a53c97a8db4fd5d3546  Math_Stats-0.9.1.tgz


More information about the scm-commits mailing list