From b370bc529bde643b06f344d39eee94c1c4ab9556 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 3 Apr 2018 06:44:40 +0200
Subject: update to 3.2.0 from Fedora

* Fri Mar 30 2018 Shawn Iwinski <shawn@iwin.ski> - 3.2.0-1
- Update to 3.2.0 (RHBZ #1505200)

* Fri Mar 30 2018 Shawn Iwinski <shawn@iwin.ski> - 3.1.13-2
- Update range dependencies' conditional to include RHEL8+
---
 php-consolidation-output-formatters.spec | 37 +++++++++++++++++++++++++-------
 1 file changed, 29 insertions(+), 8 deletions(-)

(limited to 'php-consolidation-output-formatters.spec')

diff --git a/php-consolidation-output-formatters.spec b/php-consolidation-output-formatters.spec
index 31ebb83..94be8d1 100644
--- a/php-consolidation-output-formatters.spec
+++ b/php-consolidation-output-formatters.spec
@@ -12,8 +12,8 @@
 
 %global github_owner     consolidation-org
 %global github_name      output-formatters
-%global github_version   3.1.13
-%global github_commit    3188461e965b32148c8fb85261833b2b72d34b8c
+%global github_version   3.2.0
+%global github_commit    da889e4bce19f145ca4ec5b1725a946f4eb625a9
 
 %global composer_vendor  consolidation
 %global composer_project output-formatters
@@ -23,7 +23,7 @@
 # "symfony/console": "^2.8|^3|^4"
 # "symfony/finder": "^2.5|^3|^4"
 %global symfony_min_ver 2.8
-%if 0%{?fedora} >= 27
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 %global symfony_max_ver 5.0
 %else
 %global symfony_max_ver 4.0
@@ -50,12 +50,14 @@ BuildArch:     noarch
 ## composer.json
 BuildRequires: php(language) >= %{php_min_ver}
 BuildRequires: php-composer(phpunit/phpunit)
-%if 0%{?fedora} >= 27
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 BuildRequires: (php-composer(symfony/console) >= %{symfony_min_ver} with php-composer(symfony/console) < %{symfony_max_ver})
 BuildRequires: (php-composer(symfony/finder) >= %{symfony_min_ver} with php-composer(symfony/finder) < %{symfony_max_ver})
+BuildRequires: (php-composer(symfony/var-dumper) >= %{symfony_min_ver} with php-composer(symfony/var-dumper) < %{symfony_max_ver})
 %else
 BuildRequires: php-composer(symfony/console) <  %{symfony_max_ver}
 BuildRequires: php-composer(symfony/finder) <  %{symfony_max_ver}
+BuildRequires: php-composer(symfony/var-dumper) <  %{symfony_max_ver}
 %endif
 ## phpcompatinfo (computed from version 3.1.13)
 BuildRequires: php-dom
@@ -69,9 +71,9 @@ BuildRequires: php-composer(fedora/autoloader)
 
 # composer.json
 Requires:      php(language) >= %{php_min_ver}
-%if 0%{?fedora} >= 27
-Requires: (php-composer(symfony/console) >= %{symfony_min_ver} with php-composer(symfony/console) < %{symfony_max_ver})
-Requires: (php-composer(symfony/finder) >= %{symfony_min_ver} with php-composer(symfony/finder) < %{symfony_max_ver})
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+Requires:      (php-composer(symfony/console) >= %{symfony_min_ver} with php-composer(symfony/console) < %{symfony_max_ver})
+Requires:      (php-composer(symfony/finder) >= %{symfony_min_ver} with php-composer(symfony/finder) < %{symfony_max_ver})
 %else
 Requires:      php-composer(symfony/console) <  %{symfony_max_ver}
 Requires:      php-composer(symfony/finder) <  %{symfony_max_ver}
@@ -85,6 +87,11 @@ Requires:      php-spl
 # Autoloader
 Requires:      php-composer(fedora/autoloader)
 
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+# Weak dependencies
+Suggests:      (php-composer(symfony/var-dumper) >= %{symfony_min_ver} with php-composer(symfony/var-dumper) < %{symfony_max_ver})
+%endif
+
 # Composer
 Provides:      php-composer(%{composer_vendor}/%{composer_project}) = %{version}
 
@@ -122,6 +129,14 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php';
         '%{phpdir}/Symfony/Component/Finder/autoload.php',
     ],
 ]);
+
+\Fedora\Autoloader\Dependencies::optional([
+    [
+        '%{phpdir}/Symfony4/Component/VarDumper/autoload.php',
+        '%{phpdir}/Symfony3/Component/VarDumper/autoload.php',
+        '%{phpdir}/Symfony/Component/VarDumper/autoload.php',
+    ],
+]);
 AUTOLOAD
 
 
@@ -145,7 +160,7 @@ rm -f tests/testAPIDocs.php
 : Upstream tests
 RETURN_CODE=0
 PHPUNIT=$(which phpunit)
-for PHP_EXEC in "" php71 php72; do
+for PHP_EXEC in "" %{?rhel:php55 php56} php70 php71 php72; do
     if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then
         $PHP_EXEC $PHPUNIT --verbose --bootstrap bootstrap.php \
             || RETURN_CODE=1
@@ -167,6 +182,12 @@ exit $RETURN_CODE
 
 
 %changelog
+* Fri Mar 30 2018 Shawn Iwinski <shawn@iwin.ski> - 3.2.0-1
+- Update to 3.2.0 (RHBZ #1505200)
+
+* Fri Mar 30 2018 Shawn Iwinski <shawn@iwin.ski> - 3.1.13-2
+- Update range dependencies' conditional to include RHEL8+
+
 * Wed Feb 21 2018 Shawn Iwinski <shawn@iwin.ski> - 3.1.13-1
 - Update to 3.1.13 (RHBZ #1505200)
 - Add range version dependencies for Fedora >= 27
-- 
cgit