[php-pear-Benchmark] update to 1.2.8 - QA Release
Remi Collet
remi at fedoraproject.org
Tue Oct 26 18:13:17 UTC 2010
commit 7a51a374e0fefd773a6b9c0ff37824525705edf8
Author: remi <fedora at famillecollet.com>
Date: Tue Oct 26 20:13:15 2010 +0200
update to 1.2.8 - QA Release
.gitignore | 2 +
php-pear-Benchmark.spec | 48 ++++++++++++++++++++++++++++++----------------
sources | 2 +-
xml2changelog | 40 +++++++++++++++++++++++++++++++++++++++
4 files changed, 74 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4f781a5..38e4383 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
Benchmark-1.2.7.tgz
+package.xml
+/Benchmark-1.2.8.tgz
diff --git a/php-pear-Benchmark.spec b/php-pear-Benchmark.spec
index 13ccf58..6bc9c25 100644
--- a/php-pear-Benchmark.spec
+++ b/php-pear-Benchmark.spec
@@ -1,24 +1,27 @@
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%global ClassName Benchmark
+%global pear_name Benchmark
Name: php-pear-Benchmark
-Version: 1.2.7
-Release: 4%{?dist}
+Version: 1.2.8
+Release: 1%{?dist}
Summary: Framework to benchmark PHP scripts or function calls
Group: Development/Libraries
License: BSD
URL: http://pear.php.net/package/Benchmark
-Source0: http://pear.php.net/get/%{ClassName}-%{version}.tgz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+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
+
Requires: php-pear(PEAR)
-Requires(hint): php-bcmath
+Requires: php-bcmath
Requires(post): %{__pear}
Requires(postun): %{__pear}
-Provides: php-pear(%{ClassName}) = %{version}
+Provides: php-pear(%{pear_name}) = %{version}
+
%description
Framework to benchmark PHP scripts or function calls.
@@ -26,24 +29,30 @@ Framework to benchmark PHP scripts or function calls.
%prep
%setup -qc
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{ClassName}-%{version}/%{name}.xml
-cd %{ClassName}-%{version}
+%{_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
-cd %{ClassName}-%{version}
+cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.
%install
-cd %{ClassName}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
-%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
+cd %{pear_name}-%{version}
+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_docdir}/%{pear_name} ../docdir
# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
@@ -64,18 +73,23 @@ rm -rf $RPM_BUILD_ROOT
%postun
if [ "$1" -eq "0" ]; then
%{__pear} uninstall --nodeps --ignore-errors --register-only \
- %{ClassName} >/dev/null ||:
+ %{pear_name} >/dev/null ||:
fi
%files
%defattr(-,root,root,-)
-%doc %{ClassName}-%{version}/docdir/%{ClassName}/*
+%doc CHANGELOG docdir/*
%{pear_xmldir}/%{name}.xml
-%{pear_phpdir}/%{ClassName}
+%{pear_phpdir}/%{pear_name}
%changelog
+* Tue Oct 26 2010 Remi Collet <Fedora at FamilleCollet.com> - 1.2.8-1
+- Version 1.2.8 (stable) - API 1.2.7 (stable) - QA release
+- define timezone during build
+- add generated Changelog
+
* Sun Aug 15 2010 Remi Collet <Fedora at FamilleCollet.com> - 1.2.7-4
- clean spec
diff --git a/sources b/sources
index f0c0343..23c3609 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-75d325175c67a42f645fd669b98ff7a8 Benchmark-1.2.7.tgz
+4a4a1c6fbf2703ffd13167a8d34bd8d4 Benchmark-1.2.8.tgz
diff --git a/xml2changelog b/xml2changelog
new file mode 100644
index 0000000..eb6bd31
--- /dev/null
+++ b/xml2changelog
@@ -0,0 +1,40 @@
+<?php
+$prog=array_shift($_SERVER['argv']);
+if ($_SERVER['argc']<2) die ("usage : " . $prog . " path_to_package.xml [ --debug ]\n");
+$file=array_shift($_SERVER['argv']);
+
+($xml=simplexml_load_file($file)) || die ($file . " not found !\n");
+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",
+ $xml->version->release, $xml->stability->release,
+ $xml->version->api, $xml->stability->api,
+ $xml->date, $xml->notes);
+ $new=$xml->version->release;
+
+ 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);
+
+ foreach($xml->changelog->release as $rel)
+ printf("* Version %s (%s) - %s\n\n%s\n\n",
+ $rel->version, $rel->state, $rel->date, $rel->notes);
+}
+?>
More information about the scm-commits
mailing list