Update to 2.6.0 (RHBZ #1687215)

This commit is contained in:
Shawn Iwinski 2019-05-25 00:33:29 -04:00
commit cc96d9396a
4 changed files with 16 additions and 12 deletions

1
.gitignore vendored
View file

@ -2,3 +2,4 @@
/php-masterminds-html5-2.1.2-8f782e0f01a6e33a319bdc8f6de9cfd6569979a4.tar.gz
/php-masterminds-html5-2.2.2-7866e93dcf0245de22378414e0c2c7350abc45af.tar.gz
/php-masterminds-html5-2.3.0-2c37c6c520b995b761674de3be8455a381679067.tar.gz
/php-masterminds-html5-2.6.0-c961ca6a0a81dc6b55b6859b3f9ea7f402edf9ad.tar.gz

View file

@ -20,12 +20,14 @@
}
],
"require" : {
"ext-ctype": "*",
"ext-dom": "*",
"ext-libxml" : "*",
"php" : ">=5.3.0"
},
"require-dev": {
"satooshi/php-coveralls": "1.0.*",
"phpunit/phpunit" : "4.*",
"phpunit/phpunit" : "^4.8.35",
"sami/sami": "~2.0"
},
"autoload": {
@ -36,7 +38,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "2.2-dev"
"dev-master": "2.6-dev"
}
}
}

View file

@ -1,7 +1,7 @@
#
# Fedora spec file for php-masterminds-html5
#
# Copyright (c) 2015-2017 Shawn Iwinski <shawn.iwinski@gmail.com>
# Copyright (c) 2015-2019 Shawn Iwinski <shawn.iwinski@gmail.com>
#
# License: MIT
# http://opensource.org/licenses/MIT
@ -11,8 +11,8 @@
%global github_owner Masterminds
%global github_name html5-php
%global github_version 2.3.0
%global github_commit 2c37c6c520b995b761674de3be8455a381679067
%global github_version 2.6.0
%global github_commit c961ca6a0a81dc6b55b6859b3f9ea7f402edf9ad
%global composer_vendor masterminds
%global composer_project html5
@ -27,7 +27,7 @@
Name: php-%{composer_vendor}-%{composer_project}
Version: %{github_version}
Release: 4%{?dist}
Release: 1%{?dist}
Summary: An HTML5 parser and serializer
License: MIT
@ -40,30 +40,28 @@ BuildRequires: %{_bindir}/phpab
# Tests
%if %{with_tests}
## composer.json
BuildRequires: %{_bindir}/phpunit
BuildRequires: php(language) >= %{php_min_ver}
## phpcompatinfo (computed from version 2.3.0)
BuildRequires: php-composer(phpunit/phpunit) >= 4.8.35
BuildRequires: php-ctype
BuildRequires: php-dom
## phpcompatinfo (computed from version 2.6.0)
BuildRequires: php-iconv
BuildRequires: php-json
BuildRequires: php-mbstring
BuildRequires: php-pcre
BuildRequires: php-reflection
BuildRequires: php-spl
BuildRequires: php-xml
%endif
# composer.json
Requires: php(language) >= %{php_min_ver}
# phpcompatinfo (computed from version 2.3.0)
# phpcompatinfo (computed from version 2.6.0)
Requires: php-ctype
Requires: php-dom
Requires: php-iconv
Requires: php-mbstring
Requires: php-pcre
Requires: php-spl
Requires: php-xml
# Composer
Provides: php-composer(%{composer_vendor}/%{composer_project}) = %{version}
@ -140,6 +138,9 @@ exit $RETURN_CODE
%changelog
* Sat May 25 2019 Shawn Iwinski <shawn.iwinski@gmail.com> - 2.6.0-1
- Update to 2.6.0 (RHBZ #1687215)
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

View file

@ -1 +1 @@
SHA512 (php-masterminds-html5-2.3.0-2c37c6c520b995b761674de3be8455a381679067.tar.gz) = 29ceee25763bfaa428b44736d6516bbf563539f66a4523ddb37147ff57989ea41d34d470352451fecee9a2c4a86b05942ffe6b693df87cea13152beb4452ec05
SHA512 (php-masterminds-html5-2.6.0-c961ca6a0a81dc6b55b6859b3f9ea7f402edf9ad.tar.gz) = aeb8ea8da66f0396292725809df10392858e28cb87d8787837576e1ef6040e0f2757fb370a9f9035adb806687c8b7f38563d02d99019b9f347edb7bfb0061e1c