summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--php-laminas-di3.spec31
1 files changed, 6 insertions, 25 deletions
diff --git a/php-laminas-di3.spec b/php-laminas-di3.spec
index a06aaae..fcd8d3a 100644
--- a/php-laminas-di3.spec
+++ b/php-laminas-di3.spec
@@ -7,11 +7,10 @@
# Please, preserve the changelog entries
#
%global bootstrap 0
-%global gh_commit feee971d50ea327a0cac987f5de313a988203b9f
+%global gh_commit ed38ab3b066c0a1f1b087e0a664caadf1d4f8f04
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner laminas
%global gh_project laminas-di
-%global zf_name zend-di
%global php_home %{_datadir}/php
%global namespace Laminas
%global library Di
@@ -23,7 +22,7 @@
%endif
Name: php-%{gh_project}%{major}
-Version: 3.2.1
+Version: 3.2.2
Release: 1%{?dist}
Summary: Laminas Framework %{library} component v%{major}
@@ -105,11 +104,8 @@ Requires: php-reflection
Requires: php-pcre
Requires: php-spl
-# Compatibily ensure by the bridge
Provides: php-composer(%{gh_owner}/%{gh_project}) = %{version}
-Provides: php-composer(zendframework/%{zf_name}) = %{version}
Provides: php-autoloader(%{gh_owner}/%{gh_project}) = %{version}
-Provides: php-autoloader(zendframework/%{zf_name}) = %{version}
%description
@@ -145,25 +141,12 @@ cat << 'EOF' | tee -a src/autoload.php
]);
EOF
-cat << 'EOF' | tee zf.php
-<?php
-require_once '%{php_home}/Fedora/Autoloader/autoload.php';
-\Fedora\Autoloader\Dependencies::required([
- '%{php_home}/%{namespace}/ZendFrameworkBridge/autoload.php',
- dirname(dirname(__DIR__)) . '/%{namespace}/%{library}%{major}/autoload.php',
-]);
-EOF
-
%install
: Laminas library
mkdir -p %{buildroot}%{php_home}/%{namespace}/
cp -pr src %{buildroot}%{php_home}/%{namespace}/%{library}%{major}
-: Zend equiv
-mkdir -p %{buildroot}%{php_home}/Zend/%{library}%{major}
-cp -pr zf.php %{buildroot}%{php_home}/Zend/%{library}%{major}/autoload.php
-
%check
%if %{with_tests}
@@ -187,11 +170,6 @@ for cmd in php php73 php74 php80; do
fi
done
-: check compat autoloader
-php -r '
-require "%{buildroot}%{php_home}/Zend/%{library}%{major}/autoload.php";
-exit (class_exists("\\Zend\\%{library}\\Config") ? 0 : 1);
-'
exit $ret
%else
@@ -205,11 +183,14 @@ exit $ret
%license LICENSE
%doc *.md
%doc composer.json
-%{php_home}/Zend/%{library}%{major}
%{php_home}/%{namespace}/%{library}%{major}
%changelog
+* Wed Apr 14 2021 Remi Collet <remi@remirepo.net> - 3.2.2-1
+- update to 3.2.2
+- drop ZF compatibility
+
* Mon Jan 4 2021 Remi Collet <remi@remirepo.net> - 3.2.1-1
- update to 3.2.1 (no change)