diff options
Diffstat (limited to 'php-goutte.spec')
| -rw-r--r-- | php-goutte.spec | 64 |
1 files changed, 31 insertions, 33 deletions
diff --git a/php-goutte.spec b/php-goutte.spec index d294bcf..995ae3b 100644 --- a/php-goutte.spec +++ b/php-goutte.spec @@ -12,8 +12,8 @@ %global github_owner FriendsOfPHP %global github_name Goutte -%global github_version 3.2.1 -%global github_commit db5c28f4a010b4161d507d5304e28a7ebf211638 +%global github_version 3.2.2 +%global github_commit 395f61d7c2e15a813839769553a4de16fa3b3c96 %global composer_vendor fabpot %global composer_project goutte @@ -23,12 +23,16 @@ # "guzzlehttp/guzzle": "^6.0" %global guzzle_min_ver 6.0 %global guzzle_max_ver 7.0 -# "symfony/browser-kit": "~2.1|~3.0" -# "symfony/css-selector": "~2.1|~3.0" -# "symfony/dom-crawler": "~2.1|~3.0" +# "symfony/browser-kit": ~2.1|~3.0|~4.0 +# "symfony/css-selector": ~2.1|~3.0|~4.0 +# "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 -%global symfony_max_ver 4.0 +%if 0%{?fedora} >= 26 +%global symfony_max_ver 5.0 +%else +%global symfony_max_ver 4 +%endif # Build using "--without tests" to disable tests %global with_tests 0%{!?_without_tests:1} @@ -37,7 +41,7 @@ Name: php-goutte Version: %{github_version} -Release: 4%{?github_release}%{?dist} +Release: 1%{?github_release}%{?dist} Summary: A simple PHP web scraper Group: Development/Libraries @@ -45,38 +49,31 @@ License: MIT URL: https://github.com/%{github_owner}/%{github_name} Source0: %{url}/archive/%{github_commit}/%{name}-%{github_version}-%{github_commit}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch # Tests %if %{with_tests} BuildRequires: php-composer(phpunit/phpunit) ## composer.json -BuildRequires: php(language) >= %{php_min_ver} -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/browser-kit) >= %{symfony_min_ver} +BuildRequires: php(language) >= %{php_min_ver} +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/css-selector) >= %{symfony_min_ver} -BuildRequires: php-composer(symfony/dom-crawler) < %{symfony_max_ver} -BuildRequires: php-composer(symfony/dom-crawler) >= %{symfony_min_ver} -## phpcompatinfo (computed from version 3.2.0) +BuildRequires: php-composer(symfony/dom-crawler) < %{symfony_max_ver} +## phpcompatinfo (computed from version 3.2.2) BuildRequires: php-reflection ## Autoloader BuildRequires: php-composer(fedora/autoloader) %endif # composer.json -Requires: php(language) >= %{php_min_ver} -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/browser-kit) >= %{symfony_min_ver} +Requires: php(language) >= %{php_min_ver} +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/css-selector) >= %{symfony_min_ver} -Requires: php-composer(symfony/dom-crawler) < %{symfony_max_ver} -Requires: php-composer(symfony/dom-crawler) >= %{symfony_min_ver} -# phpcompatinfo (computed from version 3.2.0) +Requires: php-composer(symfony/dom-crawler) < %{symfony_max_ver} +# phpcompatinfo (computed from version 3.2.2) # <none> # Autoloader Requires: php-composer(fedora/autoloader) @@ -114,14 +111,17 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Dependencies::required([ '%{phpdir}/GuzzleHttp6/autoload.php', [ + '%{phpdir}/Symfony4/Component/BrowserKit/autoload.php', '%{phpdir}/Symfony3/Component/BrowserKit/autoload.php', '%{phpdir}/Symfony/Component/BrowserKit/autoload.php', ], [ + '%{phpdir}/Symfony4/Component/CssSelector/autoload.php', '%{phpdir}/Symfony3/Component/CssSelector/autoload.php', '%{phpdir}/Symfony/Component/CssSelector/autoload.php', ], [ + '%{phpdir}/Symfony4/Component/DomCrawler/autoload.php', '%{phpdir}/Symfony3/Component/DomCrawler/autoload.php', '%{phpdir}/Symfony/Component/DomCrawler/autoload.php', ], @@ -130,8 +130,6 @@ AUTOLOAD %install -rm -rf %{buildroot} - mkdir -p %{buildroot}/%{phpdir}/Goutte cp -p Goutte/{autoload,Client}.php %{buildroot}/%{phpdir}/Goutte/ @@ -154,12 +152,7 @@ exit $RETURN_CODE %endif -%clean -rm -rf %{buildroot} - - %files -%defattr(-,root,root,-) %{!?_licensedir:%global license %%doc} %license LICENSE %doc *.rst @@ -168,6 +161,11 @@ rm -rf %{buildroot} %changelog +* Wed Dec 13 2017 Shawn Iwinski <shawn.iwinski@gmail.com> - 3.2.2-1 +- Update to 3.2.2 (RHBZ #1409941) +- Allow Symfony 4 +- Remove patch + * Thu Sep 21 2017 Shawn Iwinski <shawn.iwinski@gmail.com> - 3.2.0-4 - Add max versions to BuildRequires - Allow Symfony 3 |