[php-opencloud] Updated to 1.12.1 (BZ #1172637)

Shawn Iwinski siwinski at fedoraproject.org
Fri Jan 2 20:04:09 UTC 2015


commit 0acc1e021f515c368028b47864a7d785ae5b15d7
Author: Shawn Iwinski <shawn.iwinski at gmail.com>
Date:   Fri Jan 2 15:04:06 2015 -0500

    Updated to 1.12.1 (BZ #1172637)
    
    - Added php-composer(rackspace/php-opencloud) virtual provide

 .gitignore         |    1 +
 php-opencloud.spec |   35 ++++++++++++++++-------------------
 sources            |    3 +--
 3 files changed, 18 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7dc9fd5..c5f613d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /php-opencloud-1.6.0-7be280f.tar.gz
 /php-opencloud-1.11.0-ed22aa68966ee8a6c26779453cf90b5e5b96a922.tar.gz
+/php-opencloud-1.12.1-23105f00eb648c10cc360cbc04231018117b0302.tar.gz
diff --git a/php-opencloud.spec b/php-opencloud.spec
index 18f39b6..64d21fb 100644
--- a/php-opencloud.spec
+++ b/php-opencloud.spec
@@ -12,8 +12,8 @@
 
 %global github_owner     rackspace
 %global github_name      php-opencloud
-%global github_version   1.11.0
-%global github_commit    ed22aa68966ee8a6c26779453cf90b5e5b96a922
+%global github_version   1.12.1
+%global github_commit    23105f00eb648c10cc360cbc04231018117b0302
 
 %global composer_vendor  rackspace
 %global composer_project php-opencloud
@@ -35,7 +35,7 @@
 
 Name:          php-opencloud
 Version:       %{github_version}
-Release:       3%{?github_release}%{?dist}
+Release:       1%{?github_release}%{?dist}
 Summary:       PHP SDK for OpenStack/Rackspace APIs
 
 License:       ASL 2.0
@@ -51,7 +51,7 @@ BuildRequires: php-composer(psr/log) >= %{psr_log_min_ver}
 BuildRequires: php-composer(psr/log) <  %{psr_log_max_ver}
 BuildRequires: php-guzzle-Guzzle     >= %{guzzle_min_ver}
 BuildRequires: php-guzzle-Guzzle     <  %{guzzle_max_ver}
-# phpcompatinfo (computed from version 1.11.0)
+# phpcompatinfo (computed from version 1.12.1)
 BuildRequires: php-curl
 BuildRequires: php-date
 BuildRequires: php-hash
@@ -67,13 +67,16 @@ Requires:      php-composer(psr/log) >= %{psr_log_min_ver}
 Requires:      php-composer(psr/log) <  %{psr_log_max_ver}
 Requires:      php-guzzle-Guzzle     >= %{guzzle_min_ver}
 Requires:      php-guzzle-Guzzle     <  %{guzzle_max_ver}
-# phpcompatinfo (computed from version 1.11.0)
+# phpcompatinfo (computed from version 1.12.1)
 Requires:      php-date
 Requires:      php-hash
 Requires:      php-json
 Requires:      php-pcre
 Requires:      php-spl
 
+# Composer
+Provides:      php-composer(%{composer_vendor}/%{composer_project}) = %{version}
+
 
 %description
 The PHP SDK should work with most OpenStack-based cloud deployments, though
@@ -95,21 +98,13 @@ Documentation for PHP SDK for OpenStack/Rackspace APIs.
 %prep
 %setup -qn %{github_name}-%{github_commit}
 
-# Fix version
-# https://github.com/rackspace/php-opencloud/pull/445
-sed 's/1.10.0/%{github_version}/' -i lib/OpenCloud/Version.php
-
-# W: spurious-executable-perm
-# https://github.com/rackspace/php-opencloud/pull/446
-find docs -type f -name '*.md' -exec chmod a-x "{}" \;
-
 
 %build
 # Empty build section, nothing required
 
 
 %install
-mkdir -pm 0755 %{buildroot}%{phpdir}
+mkdir -p %{buildroot}%{phpdir}
 cp -rp lib/OpenCloud %{buildroot}%{phpdir}/
 
 
@@ -126,12 +121,10 @@ spl_autoload_register(function ($class) {
 });
 AUTOLOAD
 
-# Create PHPUnit config with colors turned off and no coverage-clover logging
-sed -e 's/colors="true"/colors="false"/' phpunit.xml.dist \
-    -e '/coverage-clover/d' \
-    > phpunit.xml
+# Create PHPUnit config with no coverage-clover logging
+sed -e '/coverage-clover/d' phpunit.xml.dist > phpunit.xml
 
-%{__phpunit} --include-path %{buildroot}%{phpdir}:./tests -d date.timezone="UTC"
+%{__phpunit} --include-path %{buildroot}%{phpdir}:./tests
 %else
 : Tests skipped
 %endif
@@ -149,6 +142,10 @@ sed -e 's/colors="true"/colors="false"/' phpunit.xml.dist \
 
 
 %changelog
+* Fri Jan 02 2015 Shawn Iwinski <shawn.iwinski at gmail.com> - 1.12.1-1
+- Updated to 1.12.1 (BZ #1172637)
+- Added php-composer(rackspace/php-opencloud) virtual provide
+
 * Sat Nov 22 2014 Shawn Iwinski <shawn.iwinski at gmail.com> - 1.11.0-3
 - Removed obsolete of php-cloudfiles
 
diff --git a/sources b/sources
index 93dafdd..4553882 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-f2bbc17897a95c67cf50a1c9547da7f5  php-opencloud-1.6.0-7be280f.tar.gz
-6b015e9be1411e78504e2566a27443f9  php-opencloud-1.11.0-ed22aa68966ee8a6c26779453cf90b5e5b96a922.tar.gz
+98b4d6924fe681ce896278b28a7c4428  php-opencloud-1.12.1-23105f00eb648c10cc360cbc04231018117b0302.tar.gz


More information about the scm-commits mailing list