summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2020-01-17 15:39:24 +0100
committerRemi Collet <remi@remirepo.net>2020-01-17 15:39:24 +0100
commit492008af63136762e4d642f8f2d065b36e9dc6a3 (patch)
tree4825143dd92e982e43bb076073fb4eecba3e5015
parentc1bed52831bf6ec9ce933dab813312154ee77a4a (diff)
cleanup
-rw-r--r--php-laminas-uri.spec14
1 files changed, 10 insertions, 4 deletions
diff --git a/php-laminas-uri.spec b/php-laminas-uri.spec
index 2a3f4f3..b2bb2bf 100644
--- a/php-laminas-uri.spec
+++ b/php-laminas-uri.spec
@@ -12,10 +12,10 @@
%global gh_owner laminas
%global gh_project laminas-uri
%global zf_name zend-uri
-%global namespace Laminas
%global php_home %{_datadir}/php
-
+%global namespace Laminas
%global library Uri
+
%if %{bootstrap}
%global with_tests 0%{?_with_tests:1}
%else
@@ -24,7 +24,7 @@
Name: php-%{gh_project}
Version: 2.7.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: %{namespace} Framework %{library} component
License: BSD
@@ -84,6 +84,9 @@ Requires: php-composer(fedora/autoloader)
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.7.1-99
Provides: php-zendframework-%{zf_name} = %{version}-99
@@ -151,7 +154,7 @@ EOF
: check compat autoloader
php -r '
require "%{buildroot}%{php_home}/Zend/%{library}/autoload.php";
-return (class_exists("\\Zend\\%{library}\\StorageFactory") ? 0 : 1);
+exit (class_exists("\\Zend\\%{library}\\File") ? 0 : 1);
'
: upstream test suite
@@ -179,6 +182,9 @@ exit $ret
%changelog
+* Fri Jan 17 2020 Remi Collet <remi@remirepo.net> - 2.7.1-2
+- cleanup
+
* Thu Jan 9 2020 Remi Collet <remi@remirepo.net> - 2.7.1-1
- switch to Laminas
- add patches for PHP 7.4 from upstream and from