[php-pear-Log/f13/master] update to 1.12.3, run tests during %%check
Remi Collet
remi at fedoraproject.org
Tue Sep 28 15:51:38 UTC 2010
commit c23014f20e047eb1b57925aac59a0ea248ff8b3f
Author: remi <fedora at famillecollet.com>
Date: Tue Sep 28 17:51:37 2010 +0200
update to 1.12.3, run tests during %%check
php-pear-Log.spec | 39 +++++++++++++++++++++++++--------------
sources | 2 +-
xml2changelog | 26 ++++++++++++++++----------
3 files changed, 42 insertions(+), 25 deletions(-)
---
diff --git a/php-pear-Log.spec b/php-pear-Log.spec
index 5d649e0..b162198 100644
--- a/php-pear-Log.spec
+++ b/php-pear-Log.spec
@@ -1,10 +1,10 @@
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%define pear_name Log
+%global pear_name Log
Summary: Abstracted logging facility for PHP
Summary(fr): Abstraction des outils d'enregistrement de traces pour PHP
Name: php-pear-Log
-Version: 1.12.0
+Version: 1.12.3
Release: 1%{?dist}
License: MIT
Group: Development/Libraries
@@ -35,19 +35,26 @@ and "php-pear-MDB2" (version >= 2.0.0RC1).
%description -l fr
-L'extension "log" fournit un sytème d'abstraction des enregistrements
+L'extension "log" fournit un système d'abstraction des enregistrements
de traces. Il gère l'affichage sur la console, l'enregistrement dans un
fichier, dans le "syslog", dans une base SQL ou Sqlite, l'envoi de mails
-ou la création d'évenements à un calendrier "mcal".
+ou la création d'évènements dans un calendrier "mcal".
-php-pear-Log peut optionellement utiliser les extensions
+php-pear-Log peut optionnellement utiliser les extensions
"php-pear-DB" (version >= 1.3) et "php-pear-MDB2" (version >= 2.0.0RC1).
%prep
%setup -c -q
-%{_bindir}/php -n %{SOURCE2} package.xml >CHANGELOG
-mv package.xml %{pear_name}-%{version}/%{name}.xml
+%{_bindir}/php -n %{SOURCE2} package.xml | tee CHANGELOG | head -n 10
+
+# Create a "localized" php.ini to avoid build warning
+cp /etc/php.ini .
+echo "date.timezone=UTC" >>php.ini
+
+cd %{pear_name}-%{version}
+# package.xml is V2
+mv ../package.xml %{name}.xml
%build
@@ -58,7 +65,7 @@ mv package.xml %{pear_name}-%{version}/%{name}.xml
rm -rf %{buildroot} docdir
pushd Log-%{version}
-%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
+PHPRC=../php.ini %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
# Clean up unnecessary files
rm -rf %{buildroot}%{pear_phpdir}/.??*
@@ -81,12 +88,11 @@ rm -rf %{buildroot}
lst=$(find %{buildroot}%{pear_phpdir} -exec grep -q %{buildroot} {} \; -print)
[ ! -z "$lst" ] && echo "Reference to BUILDROOT in $lst" && exit 1;
-# For documentation purpose only
-# After install, as root :
-# pear run-tests -p Log
-# Should return (1.12.0)
-# 19 PASSED TESTS
-# 1 SKIPPED TESTS
+cd %{pear_name}-%{version}
+PHPRC=../php.ini %{__pear} \
+ run-tests \
+ -i "-d include_path=%{buildroot}%{pear_phpdir}:%{pear_phpdir}" \
+ tests
%post
@@ -110,6 +116,11 @@ fi
%changelog
+* Tue Sep 28 2010 Remi Collet <Fedora at FamilleCollet.com> 1.12.3-1
+- Version 1.12.3 (stable) - API 1.0.0 (stable)
+- run tests during %%check
+- type in french description
+
* Mon Jan 25 2010 Remi Collet <Fedora at FamilleCollet.com> 1.12.0-1
- update to 1.12.0
diff --git a/sources b/sources
index d7ab4d2..acf3f21 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7fe68920afc4b122cb15aba40d735cb6 Log-1.12.0.tgz
+9930cb6d52b3af2ca6a24db267e237f0 Log-1.12.3.tgz
diff --git a/xml2changelog b/xml2changelog
index c114873..eb6bd31 100644
--- a/xml2changelog
+++ b/xml2changelog
@@ -13,16 +13,22 @@ if ($xml['version'] >= "2"){ // Package.xml V 2.0
$xml->date, $xml->notes);
$new=$xml->version->release;
- if (isset($xml->changelog->release) && count($xml->changelog->release))
- foreach($xml->changelog->release as $rel) {
- $old=$rel->version->release;
- if ("$old" != "$new") {
- printf("*** Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
- $rel->version->release, $rel->stability->release,
- $rel->version->api, $rel->stability->api,
- $rel->date, $rel->notes);
- }
- }
+ if (isset($xml->changelog->release) && count($xml->changelog->release)) {
+ $tab = array();
+ foreach($xml->changelog->release as $rel) {
+ $old=$rel->version->release;
+ if ("$old" != "$new") {
+ $tab[''.$rel->date] = $rel;
+ }
+ }
+ krsort($tab);
+ foreach($tab as $rel) {
+ printf("*** Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
+ $rel->version->release, $rel->stability->release,
+ $rel->version->api, $rel->stability->api,
+ $rel->date, $rel->notes);
+ }
+ }
} else { // Package.xml V 1.0
printf("* Version %s (%s) - %s\n\n%s\n\n",
$xml->release->version, $xml->release->state, $xml->release->date, $xml->release->notes);
More information about the scm-commits
mailing list