[php-pear-HTTP-OAuth/f15] update to 0.2.3
Remi Collet
remi at fedoraproject.org
Mon Jul 18 16:47:21 UTC 2011
commit eb0049e5c8cbd62c2241cc372567cc3d35261003
Author: remi <fedora at famillecollet.com>
Date: Mon Jul 18 18:47:08 2011 +0200
update to 0.2.3
.gitignore | 5 ++---
php-pear-HTTP-OAuth.spec | 26 ++++++++++++--------------
sources | 2 +-
xml2changelog | 21 ++++++++++++---------
4 files changed, 27 insertions(+), 27 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 66138da..7f47f0b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
package*.xml
-HTTP_OAuth-0.1.18.tgz
-/HTTP_OAuth-0.2.1.tgz
-/HTTP_OAuth-0.2.2.tgz
+*~
+/HTTP_OAuth-0.2.3.tgz
diff --git a/php-pear-HTTP-OAuth.spec b/php-pear-HTTP-OAuth.spec
index 9ec491c..11bb41d 100644
--- a/php-pear-HTTP-OAuth.spec
+++ b/php-pear-HTTP-OAuth.spec
@@ -2,8 +2,8 @@
%global pear_name HTTP_OAuth
Name: php-pear-HTTP-OAuth
-Version: 0.2.2
-Release: 2%{?dist}
+Version: 0.2.3
+Release: 1%{?dist}
Summary: Implementation of the OAuth spec
Group: Development/Libraries
@@ -41,10 +41,6 @@ Allows the use of the consumer and provider angles of the OAuth spec.
%prep
%setup -q -c
-# Create a "localized" php.ini to avoid build warning
-cp /etc/php.ini .
-echo "date.timezone=UTC" >>php.ini
-
%{_bindir}/php -n %{SOURCE2} package.xml | tee CHANGELOG | head -n 10
cd %{pear_name}-%{version}
@@ -58,15 +54,12 @@ cd %{pear_name}-%{version}
%install
+rm -rf $RPM_BUILD_ROOT
cd %{pear_name}-%{version}
-rm -rf $RPM_BUILD_ROOT docdir
-PHPRC=../php.ini %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
+%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
-# Move documentation
-mkdir -p docdir
-mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir
# fix rpmlint warnings
-sed -i -e 's/\r//' docdir/%{pear_name}/examples/jquery.fade.js
+sed -i -e 's/\r//' $RPM_BUILD_ROOT%{pear_docdir}/%{pear_name}/examples/jquery.fade.js
# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
@@ -82,9 +75,10 @@ rm -rf $RPM_BUILD_ROOT
%check
cd %{pear_name}-%{version}/tests
+# for 0.2.3 : OK (70 tests, 192 assertions)
phpunit \
-d date.timezone=UTC \
- -d include_path=%{pear_phpdir}:$RPM_BUILD_ROOT%{pear_phpdir} \
+ -d include_path=.:$RPM_BUILD_ROOT%{pear_phpdir}:%{pear_phpdir} \
AllTests.php
@@ -102,7 +96,7 @@ fi
%files
%defattr(-,root,root,-)
%doc CHANGELOG
-%doc %{pear_name}-%{version}/docdir/%{pear_name}/*
+%doc %{pear_docdir}/%{pear_name}
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/HTTP/OAuth.php
%{pear_phpdir}/HTTP/OAuth
@@ -110,6 +104,10 @@ fi
%changelog
+* Mon Jul 18 2011 Remi Collet <remi at fedoraproject.org> 0.2.3-1
+- Version 0.2.3 (alpha) - API 0.2.0 (alpha)
+- doc in /usr/share/doc/pear
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index bb93b62..d81cd8e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-708cc04fae2271a8b47d9be32b87ae62 HTTP_OAuth-0.2.2.tgz
+368106d601b5c620603038aeb8465ee9 HTTP_OAuth-0.2.3.tgz
diff --git a/xml2changelog b/xml2changelog
index eb6bd31..4c789f4 100644
--- a/xml2changelog
+++ b/xml2changelog
@@ -7,11 +7,14 @@ $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",
- $xml->version->release, $xml->stability->release,
- $xml->version->api, $xml->stability->api,
- $xml->date, $xml->notes);
- $new=$xml->version->release;
+ $new = "";
+ if (strlen(trim($xml->notes))>1) { // Ignore too short descr.
+ 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();
@@ -20,14 +23,14 @@ if ($xml['version'] >= "2"){ // Package.xml V 2.0
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->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",
More information about the scm-commits
mailing list