[php-opencloud] Updated to 1.11.0 (BZ #1159522)
Shawn Iwinski
siwinski at fedoraproject.org
Sun Nov 2 19:36:16 UTC 2014
commit 575a377d467c80539f2033fea4fe670d84913c0d
Author: Shawn Iwinski <siwinski at redhat.com>
Date: Sun Nov 2 14:36:13 2014 -0500
Updated to 1.11.0 (BZ #1159522)
- Spec cleanup
.gitignore | 1 +
php-opencloud.spec | 166 +++++++++++++++++++++++++++++++++++++++-------------
sources | 1 +
3 files changed, 128 insertions(+), 40 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a59b1f1..7dc9fd5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/php-opencloud-1.6.0-7be280f.tar.gz
+/php-opencloud-1.11.0-ed22aa68966ee8a6c26779453cf90b5e5b96a922.tar.gz
diff --git a/php-opencloud.spec b/php-opencloud.spec
index f4ad18d..fb951bd 100644
--- a/php-opencloud.spec
+++ b/php-opencloud.spec
@@ -1,71 +1,158 @@
-%global vendor OpenCloud
-%global commit 7be280fde422651d0966c70b07f6477b37dd4270
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-
-Name: php-opencloud
-Version: 1.6.0
-Release: 5%{?dist}
-Summary: PHP SDK for OpenStack/Rackspace APIs
-
-License: ASL 2.0
-URL: http://php-opencloud.com/
-Source0: https://github.com/rackspace/php-opencloud/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
-
-BuildRequires: php-phpunit-PHPUnit
-
-Requires: php-spl php-curl php-date php-fileinfo php-hash php-json
-Requires: php-pcre
-
-BuildArch: noarch
-
-Obsoletes: php-cloudfiles
+#
+# RPM spec file for php-egulias-email-validator
+#
+# Copyright (c) 2013-2014 Gregor Tätzner <brummbq at fedoraproject.org>
+# Shawn Iwinski <shawn.iwinski at gmail.com>
+#
+# License: MIT
+# http://opensource.org/licenses/MIT
+#
+# Please preserve changelog entries
+#
+
+%global github_owner rackspace
+%global github_name php-opencloud
+%global github_version 1.11.0
+%global github_commit ed22aa68966ee8a6c26779453cf90b5e5b96a922
+
+%global composer_vendor rackspace
+%global composer_project php-opencloud
+
+# "php" : ">=5.3.3"
+%global php_min_ver 5.3.3
+# "guzzle/http" : "~3.8"
+%global guzzle_min_ver 3.8
+%global guzzle_max_ver 4.0
+# "psr/log": "~1.0"
+%global psr_log_min_ver 1.0
+%global psr_log_max_ver 2.0
+
+# Build using "--without tests" to disable tests
+%global with_tests %{?_without_tests:0}%{!?_without_tests:1}
+
+%{!?phpdir: %global phpdir %{_datadir}/php}
+%{!?__phpunit: %global __phpunit %{_bindir}/phpunit}
+
+Name: php-opencloud
+Version: %{github_version}
+Release: 1%{?github_release}%{?dist}
+Summary: PHP SDK for OpenStack/Rackspace APIs
+
+License: ASL 2.0
+URL: http://php-opencloud.com/
+Source0: https://github.com/%{github_owner}/%{github_name}/archive/%{github_commit}/%{name}-%{github_version}-%{github_commit}.tar.gz
+
+BuildArch: noarch
+BuildRequires: php-phpunit-PHPUnit
+# composer.json
+BuildRequires: php(language) >= %{php_min_ver}
+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)
+BuildRequires: php-curl
+BuildRequires: php-date
+BuildRequires: php-hash
+BuildRequires: php-json
+BuildRequires: php-pcre
+BuildRequires: php-reflection
+BuildRequires: php-spl
+
+# composer.json
+Requires: php(language) >= %{php_min_ver}
+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)
+Requires: php-date
+Requires: php-hash
+Requires: php-json
+Requires: php-pcre
+Requires: php-spl
+
+Obsoletes: php-cloudfiles
%description
-The PHP SDK should work with most OpenStack-based cloud deployments, though it
-specifically targets the Rackspace public cloud. In general, whenever a
-Rackspace deployment is substantially different than a pure OpenStack one, a
-separate Rackspace subclass is provided so that you can still use the SDK with
-a pure OpenStack instance (for example, see the OpenStack class (for OpenStack)
-and the Rackspace subclass).
+The PHP SDK should work with most OpenStack-based cloud deployments, though
+it specifically targets the Rackspace public cloud. In general, whenever a
+Rackspace deployment is substantially different than a pure OpenStack one,
+a separate Rackspace subclass is provided so that you can still use the SDK
+with a pure OpenStack instance (for example, see the OpenStack class (for
+OpenStack) and the Rackspace subclass).
+
%package doc
-Summary: Documentation for OpenStack/Rackspace APIs PHP SDK
+Summary: Documentation for PHP SDK for OpenStack/Rackspace APIs
+
%description doc
-%{summary}
+Documentation for PHP SDK for OpenStack/Rackspace APIs.
%prep
-%setup -q -n %{name}-%{commit}
+%setup -qn %{github_name}-%{github_commit}
-# EOL encoding
-sed -i 's/\r$//' docs/api/css/jquery.treeview.css
+# 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
-# nothing to build
+# Empty build section, nothing required
%install
-INSTALL_DIR=%{buildroot}%{_datadir}/php
-mkdir -p $INSTALL_DIR
-cp -a lib/%{vendor} $INSTALL_DIR
+mkdir -pm 0755 %{buildroot}%{phpdir}
+cp -rp lib/OpenCloud %{buildroot}%{phpdir}/
%check
-phpunit -d date.timezone=UTC .
+%if %{with_tests}
+# Create autoloader
+mkdir vendor
+cat > vendor/autoload.php <<'AUTOLOAD'
+<?php
+
+spl_autoload_register(function ($class) {
+ $src = str_replace('\\', '/', $class).'.php';
+ @include_once $src;
+});
+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
+
+%{__phpunit} --include-path %{buildroot}%{phpdir}:./tests -d date.timezone="UTC"
+%else
+: Tests skipped
+%endif
%files
-%doc LICENSE README.md TODO.md composer.json CONTRIBUTORS.md TODO.md
-%{_datadir}/php/%{vendor}
+%{!?_licensedir:%global license %%doc}
+%license LICENSE
+%doc *.md composer.json
+%{phpdir}/OpenCloud
+
%files doc
%doc samples docs
%changelog
+* Sun Nov 02 2014 Shawn Iwinski <shawn.iwinski at gmail.com> - 1.11.0-1
+- Updated to 1.11.0 (BZ #1159522)
+- Spec cleanup
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
@@ -81,4 +168,3 @@ phpunit -d date.timezone=UTC .
* Tue Dec 31 2013 Gregor Tätzner <brummbq at fedoraproject.org> - 1.6.0-1
- initial packaging
-
diff --git a/sources b/sources
index 85f9776..93dafdd 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
f2bbc17897a95c67cf50a1c9547da7f5 php-opencloud-1.6.0-7be280f.tar.gz
+6b015e9be1411e78504e2566a27443f9 php-opencloud-1.11.0-ed22aa68966ee8a6c26779453cf90b5e5b96a922.tar.gz
More information about the scm-commits
mailing list