summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json6
-rw-r--r--php-asm89-stack-cors.spec47
2 files changed, 33 insertions, 20 deletions
diff --git a/composer.json b/composer.json
index 18e96c6..6430538 100644
--- a/composer.json
+++ b/composer.json
@@ -13,8 +13,8 @@
],
"require": {
"php": ">=5.5.9",
- "symfony/http-foundation": "~2.7|~3.0",
- "symfony/http-kernel": "~2.7|~3.0"
+ "symfony/http-foundation": "~2.7|~3.0|~4.0",
+ "symfony/http-kernel": "~2.7|~3.0|~4.0"
},
"require-dev": {
"phpunit/phpunit": "^5.0 || ^4.8.10",
@@ -37,7 +37,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "1.1-dev"
+ "dev-master": "1.2-dev"
}
}
}
diff --git a/php-asm89-stack-cors.spec b/php-asm89-stack-cors.spec
index 591553a..9427210 100644
--- a/php-asm89-stack-cors.spec
+++ b/php-asm89-stack-cors.spec
@@ -2,7 +2,7 @@
#
# Fedora spec file for php-asm89-stack-cors
#
-# Copyright (c) 2016-2017 Shawn Iwinski <shawn@iwin.ski>
+# Copyright (c) 2016-2018 Shawn Iwinski <shawn@iwin.ski>
#
# License: MIT
# http://opensource.org/licenses/MIT
@@ -12,19 +12,19 @@
%global github_owner asm89
%global github_name stack-cors
-%global github_version 1.1.0
-%global github_commit 65ccbd455370f043c2e3b93482a3813603d68731
+%global github_version 1.2.0
+%global github_commit c163e2b614550aedcf71165db2473d936abbced6
%global composer_vendor asm89
%global composer_project stack-cors
# "php": ">=5.5.9"
%global php_min_ver 5.5.9
-# "symfony/http-foundation": "~2.7|~3.0"
-# "symfony/http-kernel": "~2.7|~3.0"
+# "symfony/http-foundation": "~2.7|~3.0|~4.0"
+# "symfony/http-kernel": "~2.7|~3.0|~4.0"
# NOTE: Min version not 2.7 because autoloader required
%global symfony_min_ver 2.7.1
-%global symfony_max_ver 4.0
+%global symfony_max_ver 5.0
# Build using "--without tests" to disable tests
%global with_tests 0%{!?_without_tests:1}
@@ -53,21 +53,27 @@ BuildRequires: php-fedora-autoloader-devel
## composer.json
BuildRequires: php(language) >= %{php_min_ver}
BuildRequires: php-composer(phpunit/phpunit)
-BuildRequires: php-composer(symfony/http-foundation) < %{symfony_max_ver}
-BuildRequires: php-composer(symfony/http-foundation) >= %{symfony_min_ver}
-BuildRequires: php-composer(symfony/http-kernel) < %{symfony_max_ver}
-BuildRequires: php-composer(symfony/http-kernel) >= %{symfony_min_ver}
-## phpcompatinfo (computed from version 1.1.0)
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+BuildRequires: (php-composer(symfony/http-foundation) >= %{symfony_min_ver} with php-composer(symfony/http-foundation) < %{symfony_max_ver})
+BuildRequires: (php-composer(symfony/http-kernel) >= %{symfony_min_ver} with php-composer(symfony/http-kernel) < %{symfony_max_ver})
+%else
+BuildRequires: php-composer(symfony/http-foundation) < 4
+BuildRequires: php-composer(symfony/http-kernel) < 4
+%endif
+## phpcompatinfo (computed from version 1.2.0)
## <none>
%endif
# composer.json
Requires: php(language) >= %{php_min_ver}
-Requires: php-composer(symfony/http-foundation) >= %{symfony_min_ver}
-Requires: php-composer(symfony/http-foundation) < %{symfony_max_ver}
-Requires: php-composer(symfony/http-kernel) >= %{symfony_min_ver}
-Requires: php-composer(symfony/http-kernel) < %{symfony_max_ver}
-# phpcompatinfo (computed from version 1.1.0)
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+Requires: (php-composer(symfony/http-foundation) >= %{symfony_min_ver} with php-composer(symfony/http-foundation) < %{symfony_max_ver})
+Requires: (php-composer(symfony/http-kernel) >= %{symfony_min_ver} with php-composer(symfony/http-kernel) < %{symfony_max_ver})
+%else
+Requires: php-composer(symfony/http-foundation) < 4
+Requires: php-composer(symfony/http-kernel) < 4
+%endif
+# phpcompatinfo (computed from version 1.2.0)
# <none>
# Autoloader
Requires: php-composer(fedora/autoloader)
@@ -100,10 +106,12 @@ cat <<'AUTOLOAD' | tee -a src/Asm89/Stack/autoload-cors.php
\Fedora\Autoloader\Dependencies::required([
[
+ '%{phpdir}/Symfony4/Component/HttpFoundation/autoload.php',
'%{phpdir}/Symfony3/Component/HttpFoundation/autoload.php',
'%{phpdir}/Symfony/Component/HttpFoundation/autoload.php',
],
[
+ '%{phpdir}/Symfony4/Component/HttpKernel/autoload.php',
'%{phpdir}/Symfony3/Component/HttpKernel/autoload.php',
'%{phpdir}/Symfony/Component/HttpKernel/autoload.php',
],
@@ -120,7 +128,7 @@ cp -rp src/Asm89 %{buildroot}%{phpdir}/
%if %{with_tests}
: Upstream tests
RETURN_CODE=0
-for PHP_EXEC in php php56 php70 php71 php72; do
+for PHP_EXEC in php php71 php72; do
if [ "php" == "$PHP_EXEC" ] || which $PHP_EXEC; then
$PHP_EXEC %{_bindir}/phpunit --verbose \
--bootstrap %{buildroot}%{phpdir}/Asm89/Stack/autoload-cors.php \
@@ -146,6 +154,11 @@ exit $RETURN_CODE
%changelog
+* Sat Apr 21 2018 Shawn Iwinski <shawn@iwin.ski> - 1.2.0-1
+- Update to 1.2.0 (RHBZ #1528097)
+- Add range version dependencies for Fedora >= 27 || RHEL >= 8
+- Update get source script to save tarball in local directory
+
* Fri Apr 14 2017 Shawn Iwinski <shawn@iwin.ski> - 1.1.0-1
- Update to 1.1.0 (RHBZ #1441443)
- Add max versions to BuildRequires