[php-guzzlehttp-streams] Updated to 1.4.0 (BZ #1124227)
Shawn Iwinski
siwinski at fedoraproject.org
Wed Jul 30 17:38:43 UTC 2014
commit 6b3a0d285f3eb7b92604fad54b173ff879ae38f1
Author: Shawn Iwinski <siwinski at redhat.com>
Date: Wed Jul 30 13:38:13 2014 -0400
Updated to 1.4.0 (BZ #1124227)
- Added option to build without tests ("--without tests")
- Added %license usage
.gitignore | 1 +
php-guzzlehttp-streams.spec | 39 +++++++++++++++++++++++++++++++++------
sources | 2 +-
3 files changed, 35 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d3a2cd6..43b35ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/php-guzzlehttp-streams-1.1.0-cf0c8c33ca95cc147efba4c714f630ee44767180.tar.gz
+/php-guzzlehttp-streams-1.4.0-3b761a328e5ed6ed519e960aded95d7acbe77894.tar.gz
diff --git a/php-guzzlehttp-streams.spec b/php-guzzlehttp-streams.spec
index 496c81e..1639cce 100644
--- a/php-guzzlehttp-streams.spec
+++ b/php-guzzlehttp-streams.spec
@@ -1,7 +1,18 @@
+#
+# RPM spec file for php-guzzlehttp-streams
+#
+# Copyright (c) 2014 Shawn Iwinski <shawn.iwinski at gmail.com>
+#
+# License: MIT
+# http://opensource.org/licenses/MIT
+#
+# Please preserve changelog entries
+#
+
%global github_owner guzzle
%global github_name streams
-%global github_version 1.1.0
-%global github_commit cf0c8c33ca95cc147efba4c714f630ee44767180
+%global github_version 1.4.0
+%global github_commit 3b761a328e5ed6ed519e960aded95d7acbe77894
%global composer_vendor guzzlehttp
%global composer_project streams
@@ -9,9 +20,12 @@
# "php": ">=5.4.0"
%global php_min_ver 5.4.0
+# Build using "--without tests" to disable tests
+%global with_tests %{?_without_tests:0}%{!?_without_tests:1}
+
Name: php-%{composer_vendor}-%{composer_project}
Version: %{github_version}
-Release: 2%{?github_release}%{?dist}
+Release: 1%{?github_release}%{?dist}
Summary: Provides a simple abstraction over streams of data
Group: Development/Libraries
@@ -20,16 +34,18 @@ URL: http://docs.guzzlephp.org/en/latest/streams.html
Source0: https://github.com/%{github_owner}/%{github_name}/archive/%{github_commit}/%{name}-%{github_version}-%{github_commit}.tar.gz
BuildArch: noarch
+%if %{with_tests}
# For tests: composer.json
BuildRequires: php(language) >= %{php_min_ver}
BuildRequires: php-phpunit-PHPUnit
-# For tests: phpcompatinfo (computed from version 1.1.0)
+# For tests: phpcompatinfo (computed from version 1.4.0)
BuildRequires: php-hash
BuildRequires: php-spl
+%endif
# composer.json
Requires: php(language) >= %{php_min_ver}
-# phpcompatinfo (computed from version 1.1.0)
+# phpcompatinfo (computed from version 1.4.0)
Requires: php-hash
Requires: php-spl
@@ -58,6 +74,7 @@ cp -pr src/* %{buildroot}%{_datadir}/php/GuzzleHttp/Stream/
%check
+%if %{with_tests}
# Create autoloader
mkdir vendor
cat > vendor/autoload.php <<'AUTOLOAD'
@@ -79,15 +96,25 @@ AUTOLOAD
sed 's/colors\s*=\s*"true"/colors="false"/' phpunit.xml.dist > phpunit.xml
%{_bindir}/phpunit --include-path="./src:./tests" -d date.timezone="UTC"
+%else
+: Tests skipped
+%endif
%files
-%doc LICENSE README.rst composer.json
+%{!?_licensedir:%global license %%doc}
+%license LICENSE
+%doc README.rst composer.json
%dir %{_datadir}/php/GuzzleHttp
%{_datadir}/php/GuzzleHttp/Stream
%changelog
+* Fri Jun 06 2014 Shawn Iwinski <shawn.iwinski at gmail.com> - 1.4.0-1
+- Updated to 1.4.0 (BZ #1124227)
+- Added option to build without tests ("--without tests")
+- Added %%license usage
+
* Fri Jun 06 2014 Shawn Iwinski <shawn.iwinski at gmail.com> - 1.1.0-2
- Updated URL
- Added php-composer(%%{composer_vendor}/%%{composer_project}) virtual provide
diff --git a/sources b/sources
index ec78149..20823a4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bb72e1b1bac9d8e62c22efbb243a0c51 php-guzzlehttp-streams-1.1.0-cf0c8c33ca95cc147efba4c714f630ee44767180.tar.gz
+04074de70d28f15b6c9032101e8b8a38 php-guzzlehttp-streams-1.4.0-3b761a328e5ed6ed519e960aded95d7acbe77894.tar.gz
More information about the scm-commits
mailing list