[php-pear-Net-Socket/f13/master] update to 1.0.10 - QA release
Remi Collet
remi at fedoraproject.org
Sat Oct 16 09:15:25 UTC 2010
commit cfdfb802ba38e475107afb98b4ec76d585d4b098
Author: remi <fedora at famillecollet.com>
Date: Sat Oct 16 11:15:16 2010 +0200
update to 1.0.10 - QA release
.gitignore | 2 ++
php-pear-Net-Socket.spec | 30 +++++++++++++++++++++---------
sources | 2 +-
xml2changelog | 26 ++++++++++++++++----------
4 files changed, 40 insertions(+), 20 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c1ae12c..c2800ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
Net_Socket-1.0.9.tgz
+package.xml
+/Net_Socket-1.0.10.tgz
diff --git a/php-pear-Net-Socket.spec b/php-pear-Net-Socket.spec
index edf80eb..f047933 100644
--- a/php-pear-Net-Socket.spec
+++ b/php-pear-Net-Socket.spec
@@ -1,9 +1,9 @@
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%define pear_name Net_Socket
+%global pear_name Net_Socket
Name: php-pear-Net-Socket
-Version: 1.0.9
-Release: 3%{?dist}
+Version: 1.0.10
+Release: 1%{?dist}
Summary: Network Socket Interface
Summary(fr): Gestion des "sockets" réseaux
@@ -37,9 +37,15 @@ Provides: php-pear(%{pear_name}) = %{version}
%prep
%setup -q -c
-%{_bindir}/php -n %{SOURCE2} package.xml >CHANGELOG
+%{_bindir}/php -n %{SOURCE2} package.xml | tee CHANGELOG | head -n 10
-mv package.xml %{pear_name}-%{version}/%{pear_name}.xml
+# 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
@@ -51,13 +57,13 @@ cd %{pear_name}-%{version}
rm -rf %{buildroot}
cd Net_Socket-%{version}
-%{__pear} install --nodeps --packagingroot %{buildroot} %{pear_name}.xml
+PHPRC=../php.ini %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
# Clean up unnecessary files
rm -rf %{buildroot}%{pear_phpdir}/.??*
%{__mkdir_p} %{buildroot}%{pear_xmldir}
-%{__install} -pm 644 %{pear_name}.xml %{buildroot}%{pear_xmldir}
+%{__install} -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
%check
@@ -72,7 +78,7 @@ rm -rf %{buildroot}
%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
@@ -85,10 +91,16 @@ fi
%defattr(-,root,root,-)
%doc CHANGELOG
%{pear_phpdir}/Net
-%{pear_xmldir}/Net_Socket.xml
+%{pear_xmldir}/%{name}.xml
%changelog
+* Sat Oct 16 2010 Remi Collet <Fedora at FamilleCollet.com> 1.0.10-1
+- Version 1.0.10 (stable) - API 1.0.9 (stable) - QA release
+- set timezone during build
+- spec cleanup
+- rename Net_Socket.xml to php-pear-Net-Socket.xml
+
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.9-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
diff --git a/sources b/sources
index eea7750..dbb7cee 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f212f6624b3623432f1ff3e6f0091ed6 Net_Socket-1.0.9.tgz
+9e5512c211742874628e392db0548222 Net_Socket-1.0.10.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