[php-pear-Console-Getargs/f13/master] update to 1.3.5 - QA release
Remi Collet
remi at fedoraproject.org
Mon Oct 11 16:29:51 UTC 2010
commit ce09537f23f8ef80fe93e51761edddf9356cf004
Author: remi <fedora at famillecollet.com>
Date: Mon Oct 11 18:29:53 2010 +0200
update to 1.3.5 - QA release
php-pear-Console-Getargs.spec | 56 +++++++++++++++++++++++++++++++---------
sources | 2 +-
xml2changelog | 24 +++++++++++++----
3 files changed, 62 insertions(+), 20 deletions(-)
---
diff --git a/php-pear-Console-Getargs.spec b/php-pear-Console-Getargs.spec
index 1167806..8c9f0a7 100644
--- a/php-pear-Console-Getargs.spec
+++ b/php-pear-Console-Getargs.spec
@@ -1,9 +1,9 @@
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%define pear_name Console_Getargs
+%global pear_name Console_Getargs
Name: php-pear-Console-Getargs
-Version: 1.3.4
-Release: 3%{?dist}.1
+Version: 1.3.5
+Release: 1%{?dist}
Summary: Command-line arguments and parameters parser
Summary(fr): Analyseur des arguments et paramètres en ligne de commande
@@ -14,13 +14,15 @@ Source0: http://pear.php.net/get/%{pear_name}-%{version}.tgz
Source2: xml2changelog
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(post): %{__pear}
Requires(postun): %{__pear}
Provides: php-pear(%{pear_name}) = %{version}
-Requires: php >= 4.1.0 php-pear(PEAR)
+Requires: php-pear(PEAR)
%description
The Console_Getargs package implements a Command Line arguments and
@@ -34,20 +36,29 @@ paramètres passés à vos applications sur la ligne de commande.
Il réalise quelques validations simples des arguments et crée
automatiquement un texte d'aide à partir de la configuration fournie.
+
%prep
-%setup -q -c
-[ -f package2.xml ] || mv package.xml package2.xml
-%{_bindir}/php -n %{SOURCE2} package2.xml >CHANGELOG
-mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
+%setup -c -q
+%{_bindir}/php -n %{SOURCE2} package.xml | tee CHANGELOG | head -n 2
+
+# 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
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.
+
%install
rm -rf $RPM_BUILD_ROOT docdir
cd %{pear_name}-%{version}
-%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml
+PHPRC=../php.ini %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
# Move documentation
mv $RPM_BUILD_ROOT%{pear_docdir}/%{pear_name} ../docdir
@@ -57,14 +68,24 @@ rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
# Install XML package description
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
-install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
+install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
+
+
+%check
+cd %{pear_name}-%{version}/tests
+%{_bindir}/phpunit \
+ -d date.timezone=UTC \
+ -d include_path=$RPM_BUILD_ROOT%{pear_phpdir}:%{pear_phpdir} \
+ AllTests.php
+
%clean
rm -rf $RPM_BUILD_ROOT
+
%post
%{__pear} install --nodeps --soft --force --register-only \
- %{pear_xmldir}/%{pear_name}.xml >/dev/null || :
+ %{pear_xmldir}/%{name}.xml >/dev/null || :
%postun
if [ $1 -eq 0 ] ; then
@@ -72,14 +93,23 @@ if [ $1 -eq 0 ] ; then
%{pear_name} >/dev/null || :
fi
+
%files
%defattr(-,root,root,-)
%doc CHANGELOG docdir/examples
-%{pear_xmldir}/%{pear_name}.xml
+%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/Console/Getargs.php
%{pear_testdir}/%{pear_name}
+
%changelog
+* Mon Oct 11 2010 Remi Collet <Fedora at FamilleCollet.com> 1.3.5-1
+- upstream Version 1.3.5 (stable) - API 1.3.5 (stable)
+- set timezone during build
+- run phpunit test suite in %%check
+- remove php (and httpd) dependency
+- rename Console_Getargs.xml to php-pear-Console-Getargs.xml
+
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.4-3.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
diff --git a/sources b/sources
index 28028ef..fba3508 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-30c90b46e41e023b7008c5f6306335aa Console_Getargs-1.3.4.tgz
+a727bc63cc5fe4e28ccb37401cdc1525 Console_Getargs-1.3.5.tgz
diff --git a/xml2changelog b/xml2changelog
index 3f7b42d..eb6bd31 100644
--- a/xml2changelog
+++ b/xml2changelog
@@ -7,16 +7,28 @@ $file=array_shift($_SERVER['argv']);
if (in_array("--debug", $_SERVER['argv'])) print_r($xml);
if ($xml['version'] >= "2"){ // Package.xml V 2.0
- printf("* Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
+ printf("*** Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
$xml->version->release, $xml->stability->release,
$xml->version->api, $xml->stability->api,
$xml->date, $xml->notes);
+ $new=$xml->version->release;
- if (is_array($xml->changelog->release)) foreach($xml->changelog->release 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);
+ 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