diff options
| -rw-r--r-- | php-goutte.spec | 36 | 
1 files changed, 27 insertions, 9 deletions
diff --git a/php-goutte.spec b/php-goutte.spec index 995ae3b..a5d27c7 100644 --- a/php-goutte.spec +++ b/php-goutte.spec @@ -2,7 +2,7 @@  #  # Fedora spec file for php-goutte  # -# Copyright (c) 2014-2017 Shawn Iwinski <shawn@iwin.ski> +# Copyright (c) 2014-2019 Shawn Iwinski <shawn@iwin.ski>  #  # License: MIT  # http://opensource.org/licenses/MIT @@ -12,8 +12,8 @@  %global github_owner    FriendsOfPHP  %global github_name     Goutte -%global github_version  3.2.2 -%global github_commit   395f61d7c2e15a813839769553a4de16fa3b3c96 +%global github_version  3.2.3 +%global github_commit   3f0eaf0a40181359470651f1565b3e07e3dd31b8  %global composer_vendor  fabpot  %global composer_project goutte @@ -28,7 +28,7 @@  # "symfony/dom-crawler": ~2.1|~3.0|~4.0  #     NOTE: Min version not 2.1 because autoloader required  %global symfony_min_ver 2.7.1 -%if 0%{?fedora} >= 26 +%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8  %global symfony_max_ver 5.0  %else  %global symfony_max_ver 4 @@ -44,7 +44,6 @@ Version:       %{github_version}  Release:       1%{?github_release}%{?dist}  Summary:       A simple PHP web scraper -Group:         Development/Libraries  License:       MIT  URL:           https://github.com/%{github_owner}/%{github_name}  Source0:       %{url}/archive/%{github_commit}/%{name}-%{github_version}-%{github_commit}.tar.gz @@ -55,26 +54,41 @@ BuildArch:     noarch  BuildRequires: php-composer(phpunit/phpunit)  ## composer.json  BuildRequires: php(language) >= %{php_min_ver} +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +BuildRequires: (php-composer(guzzlehttp/guzzle) >= %{guzzle_min_ver} with php-composer(guzzlehttp/guzzle) < %{guzzle_max_ver}) +BuildRequires: (php-composer(symfony/browser-kit) >= %{symfony_min_ver} with php-composer(symfony/browser-kit) < %{symfony_max_ver}) +BuildRequires: (php-composer(symfony/css-selector) >= %{symfony_min_ver} with php-composer(symfony/css-selector) < %{symfony_max_ver}) +BuildRequires: (php-composer(symfony/dom-crawler) >= %{symfony_min_ver} with php-composer(symfony/dom-crawler) < %{symfony_max_ver}) +%else  BuildRequires: php-composer(guzzlehttp/guzzle) <  %{guzzle_max_ver}  BuildRequires: php-composer(guzzlehttp/guzzle) >= %{guzzle_min_ver}  BuildRequires: php-composer(symfony/browser-kit) <  %{symfony_max_ver}  BuildRequires: php-composer(symfony/css-selector) <  %{symfony_max_ver}  BuildRequires: php-composer(symfony/dom-crawler) <  %{symfony_max_ver} -## phpcompatinfo (computed from version 3.2.2) +%endif +## phpcompatinfo (computed from version 3.2.3)  BuildRequires: php-reflection +BuildRequires: php-spl  ## Autoloader  BuildRequires: php-composer(fedora/autoloader)  %endif  # composer.json  Requires:      php(language) >= %{php_min_ver} +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +Requires:      (php-composer(guzzlehttp/guzzle) >= %{guzzle_min_ver} with php-composer(guzzlehttp/guzzle) < %{guzzle_max_ver}) +Requires:      (php-composer(symfony/browser-kit) >= %{symfony_min_ver} with php-composer(symfony/browser-kit) < %{symfony_max_ver}) +Requires:      (php-composer(symfony/css-selector) >= %{symfony_min_ver} with php-composer(symfony/css-selector) < %{symfony_max_ver}) +Requires:      (php-composer(symfony/dom-crawler) >= %{symfony_min_ver} with php-composer(symfony/dom-crawler) < %{symfony_max_ver}) +%else  Requires:      php-composer(guzzlehttp/guzzle) <  %{guzzle_max_ver}  Requires:      php-composer(guzzlehttp/guzzle) >= %{guzzle_min_ver}  Requires:      php-composer(symfony/browser-kit) <  %{symfony_max_ver}  Requires:      php-composer(symfony/css-selector) <  %{symfony_max_ver}  Requires:      php-composer(symfony/dom-crawler) <  %{symfony_max_ver} -# phpcompatinfo (computed from version 3.2.2) -# <none> +%endif +# phpcompatinfo (computed from version 3.2.3) +Requires:      php-spl  # Autoloader  Requires:      php-composer(fedora/autoloader) @@ -139,7 +153,7 @@ cp -p Goutte/{autoload,Client}.php %{buildroot}/%{phpdir}/Goutte/  : Upstream tests  RETURN_CODE=0  PHPUNIT=$(which phpunit) -for PHP_EXEC in "" php56 php70 php71 php72; do +for PHP_EXEC in "" php71 php72 php73 php74; do      if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then          $PHP_EXEC $PHPUNIT --verbose \              --bootstrap %{buildroot}/%{phpdir}/Goutte/autoload.php \ @@ -161,6 +175,10 @@ exit $RETURN_CODE  %changelog +* Sun Jun 16 2019 Shawn Iwinski <shawn.iwinski@gmail.com> - 3.2.3-1 +- Update to 3.2.3 (RHBZ #1596940) +- Add range version dependencies for Fedora >= 27 || RHEL >= 8 +  * Wed Dec 13 2017 Shawn Iwinski <shawn.iwinski@gmail.com> - 3.2.2-1  - Update to 3.2.2 (RHBZ #1409941)  - Allow Symfony 4  | 
