diff options
| -rw-r--r-- | composer.json | 4 | ||||
| -rw-r--r-- | php-simplesamlphp-saml2_3.spec | 17 |
2 files changed, 12 insertions, 9 deletions
diff --git a/composer.json b/composer.json index 23e1556..11fcf46 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "squizlabs/php_codesniffer": "~1.4", "phpmd/phpmd": "~1.5", "sensiolabs/security-checker": "~1.1", - "phpunit/phpunit": "~3.7", + "phpunit/phpunit": "~4", "sebastian/phpcpd": "~1.4", "mockery/mockery": "~0.9" }, @@ -38,7 +38,7 @@ }, "extra": { "branch-alias": { - "dev-master": "v3.0.x-dev" + "dev-master": "v3.1.x-dev" } } } diff --git a/php-simplesamlphp-saml2_3.spec b/php-simplesamlphp-saml2_3.spec index 3eaf796..0d2ffe9 100644 --- a/php-simplesamlphp-saml2_3.spec +++ b/php-simplesamlphp-saml2_3.spec @@ -12,8 +12,8 @@ %global github_owner simplesamlphp %global github_name saml2 -%global github_version 3.1.4 -%global github_commit 4f6af7f69f29df8555a18b9bb7b646906b45924d +%global github_version 3.1.5 +%global github_commit a07885a55fe5d3335ef0913ee9e95a75b34bfc52 %global composer_vendor simplesamlphp %global composer_project saml2 @@ -38,7 +38,7 @@ Name: php-%{composer_vendor}-%{composer_project}_3 Version: %{github_version} -Release: 2%{?github_release}%{?dist} +Release: 1%{?github_release}%{?dist} Summary: SAML2 PHP library from SimpleSAMLphp (version 3) Group: Development/Libraries @@ -56,7 +56,7 @@ 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(mockery/mockery) >= %{mockery_min_ver} with php-composer(mockery/mockery) < %{mockery_max_ver}) BuildRequires: (php-composer(psr/log) >= %{psr_log_min_ver} with php-composer(psr/log) < %{psr_log_max_ver}) BuildRequires: (php-composer(robrichards/xmlseclibs) >= %{xmlseclibs_min_ver} with php-composer(robrichards/xmlseclibs) < %{xmlseclibs_max_ver}) @@ -71,7 +71,7 @@ BuildRequires: php-composer(robrichards/xmlseclibs) >= %{xmlseclibs_min_ver} BuildRequires: php-dom BuildRequires: php-openssl BuildRequires: php-zlib -## phpcompatinfo (computed from version 3.0.2) +## phpcompatinfo (computed from version 3.1.4) BuildRequires: php-date BuildRequires: php-libxml BuildRequires: php-pcre @@ -83,7 +83,7 @@ BuildRequires: php-fedora-autoloader-devel # composer.json Requires: php(language) >= %{php_min_ver} -%if 0%{?fedora} >= 27 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 Requires: (php-composer(psr/log) >= %{psr_log_min_ver} with php-composer(psr/log) < %{psr_log_max_ver}) Requires: (php-composer(robrichards/xmlseclibs) >= %{xmlseclibs_min_ver} with php-composer(robrichards/xmlseclibs) < %{xmlseclibs_max_ver}) %else @@ -95,7 +95,7 @@ Requires: php-composer(robrichards/xmlseclibs) >= %{xmlseclibs_min_ver} Requires: php-dom Requires: php-openssl Requires: php-zlib -# phpcompatinfo (computed from version 3.0.2) +# phpcompatinfo (computed from version 3.1.4) Requires: php-date Requires: php-libxml Requires: php-pcre @@ -181,6 +181,9 @@ exit $RETURN_CODE %changelog +* Sun Apr 29 2018 Shawn Iwinski <shawn@iwin.ski> - 3.1.5-1 +- Update to 3.1.5 (RHBZ #1568917) + * Mon Mar 12 2018 Remi Collet <remi@remirepo.net> - 3.1.4-2 - fix dependencies |