summaryrefslogtreecommitdiffstats
path: root/php-laminas-validator.spec
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2020-01-15 12:19:47 +0100
committerRemi Collet <remi@remirepo.net>2020-01-15 12:19:47 +0100
commitbc1bde0bc9268468bbea70c599c47d4b6c4d35f3 (patch)
tree95faae0b01c0c29ec676816fccc82e5b58d17941 /php-laminas-validator.spec
parent3c204e2c14651f52f1f12660920c2a6601537976 (diff)
update to 2.13.1
drop patch merged upstream switch to phpunit8
Diffstat (limited to 'php-laminas-validator.spec')
-rw-r--r--php-laminas-validator.spec27
1 files changed, 16 insertions, 11 deletions
diff --git a/php-laminas-validator.spec b/php-laminas-validator.spec
index cec3d23..e8bf159 100644
--- a/php-laminas-validator.spec
+++ b/php-laminas-validator.spec
@@ -8,7 +8,7 @@
#
# When buid without config, db, filter, http, session, uri
%global bootstrap 1
-%global gh_commit 2a03c207d5ae038259f0abb588f64851cebdcb1a
+%global gh_commit 36702f033486bf1953e254f5299aad205302e79d
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner laminas
%global gh_project laminas-validator
@@ -19,7 +19,7 @@
%global with_tests 0%{!?_without_tests:1}
Name: php-%{gh_project}
-Version: 2.13.0
+Version: 2.13.1
Release: 1%{?dist}
Summary: %{namespace} Framework %{library} component
@@ -28,8 +28,6 @@ URL: https://github.com/%{gh_owner}/%{gh_project}
Source0: %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz
Source1: makesrc.sh
-Patch0: https://patch-diff.githubusercontent.com/raw/laminas/laminas-validator/pull/32.patch
-
BuildArch: noarch
# Tests
%if %{with_tests}
@@ -58,7 +56,7 @@ BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0
# "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
# "laminas/laminas-session": "^2.8",
# "laminas/laminas-uri": "^2.5",
-# "phpunit/phpunit": "^6.0.8 || ^5.7.15",
+# "phpunit/phpunit": "^7.5.20 || ^8.5.2",
# "psr/http-client": "^1.0",
# "psr/http-factory": "^1.0",
# "psr/http-message": "^1.0"
@@ -99,7 +97,7 @@ BuildRequires: php-laminas-session
BuildRequires: php-laminas-uri
%endif
%endif
-BuildRequires: phpunit6 >= 6.0.8
+BuildRequires: phpunit8 >= 8.5.2
%endif
# Autoloader
BuildRequires: php-fedora-autoloader-devel
@@ -151,9 +149,12 @@ Requires: php-intl
Requires: php-pcre
Requires: php-spl
+# remirepo:2
+Obsoletes: php-ZendFramework2-%{library} < 2.5
+Provides: php-ZendFramework2-%{library} = %{version}
# Compatibily ensure by the bridge
-Obsoletes: php-zendframework-%{zf_name} < 2.13.0-99
-Provides: php-zendframework-%{zf_name} = %{version}-99
+Obsoletes: php-zendframework-%{zf_name} < 2.13.1
+Provides: php-zendframework-%{zf_name} = %{version}
Provides: php-composer(%{gh_owner}/%{gh_project}) = %{version}
Provides: php-composer(zendframework/%{zf_name}) = %{version}
Provides: php-autoloader(%{gh_owner}/%{gh_project}) = %{version}
@@ -170,7 +171,6 @@ Documentation: https://docs.laminas.dev/%{gh_project}/
%prep
%setup -q -n %{gh_project}-%{gh_commit}
-%patch0 -p1
mv LICENSE.md LICENSE
@@ -245,14 +245,14 @@ rm test/UriTest.php
: check compat autoloader
php -r '
require "%{buildroot}%{php_home}/Zend/%{library}/autoload.php";
-return (class_exists("\\Zend\\%{library}\\Hex") ? 0 : 1);
+exit (class_exists("\\Zend\\%{library}\\Hex") ? 0 : 1);
'
: upstream test suite
ret=0
for cmd in php php72 php73 php74; do
if which $cmd; then
- $cmd -d memory_limit=1G %{_bindir}/phpunit6 --verbose || ret=1
+ $cmd -d memory_limit=1G %{_bindir}/phpunit8 --verbose || ret=1
fi
done
exit $ret
@@ -272,6 +272,11 @@ exit $ret
%changelog
+* Wed Jan 15 2020 Remi Collet <remi@remirepo.net> - 2.13.1-1
+- update to 2.13.1
+- drop patch merged upstream
+- switch to phpunit8
+
* Wed Jan 8 2020 Remi Collet <remi@remirepo.net> - 2.9.0-1
- switch to Laminas
- boostrap build without config, db, filter, http, session and uri