From 33e04869a67d82fc4b730492eaa973cc20da2794 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 2 Jul 2016 14:08:02 +0200 Subject: php-zendframework-zend-expressive-zendrouter: cleanup --- php-zendframework-zend-expressive-zendrouter.spec | 20 ++- ...ndframework-zend-expressive-zendviewrouter.spec | 157 --------------------- 2 files changed, 13 insertions(+), 164 deletions(-) delete mode 100644 php-zendframework-zend-expressive-zendviewrouter.spec diff --git a/php-zendframework-zend-expressive-zendrouter.spec b/php-zendframework-zend-expressive-zendrouter.spec index e5900d1..df88eae 100644 --- a/php-zendframework-zend-expressive-zendrouter.spec +++ b/php-zendframework-zend-expressive-zendrouter.spec @@ -22,7 +22,7 @@ Name: php-%{gh_owner}-%{gh_project} Version: 1.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: zend-mvc router support for %{library} Group: Development/Libraries @@ -48,14 +48,18 @@ BuildRequires: php-pcre # "phpunit/phpunit": "^4.7", # "squizlabs/php_codesniffer": "^2.3" BuildRequires: php-composer(phpunit/phpunit) >= 4.7 +# Autoloader +BuildRequires: php-composer(%{gh_owner}/zend-loader) >= 2.5 +# For dependencies autoloader +BuildRequires: php-zendframework-zend-loader >= 2.5.1-4 %endif # From composer, "require": { # "php": "^5.6 || ^7.0", # "psr/http-message": "^1.0", -# "zendframework/zend-expressive-router": "^1.2", -# "zendframework/zend-router": "^3.0", -# "zendframework/zend-psr7bridge": "^0.2.2" +# "zendframework/zend-expressive-router": "^1.0", +# "zendframework/zend-router": "^2.5", +# "zendframework/zend-psr7bridge": "^0.2.0" Requires: php(language) >= 5.6 Requires: php-composer(psr/http-message) >= 1.0 Requires: php-composer(psr/http-message) < 2 @@ -69,6 +73,7 @@ Requires: php-pcre %if ! %{bootstrap} # Autoloader Requires: php-composer(%{gh_owner}/zend-loader) >= 2.5 +Requires: php-zendframework-zend-loader >= 2.5.1-4 %endif Provides: php-composer(%{gh_owner}/%{gh_project}) = %{version} @@ -88,8 +93,6 @@ https://zendframework.github.io/zend-expressive/features/router/zf2/ mv LICENSE.md LICENSE -# psr/http-message load by zend-expressive-router - %build # Empty build section, nothing required @@ -127,7 +130,7 @@ if which php56; then run=1 fi if which php71; then - php70 %{_bindir}/phpunit --verbose || ret=1 + php71 %{_bindir}/phpunit --verbose || ret=1 run=1 fi if [ $run -eq 0 ]; then @@ -154,6 +157,9 @@ rm -rf %{buildroot} %changelog +* Sat Jul 2 2016 Remi Collet - 1.1.0-2 +- cleanup and build for ZF2 + * Fri Jul 1 2016 Remi Collet - 1.1.0-1 - initial package diff --git a/php-zendframework-zend-expressive-zendviewrouter.spec b/php-zendframework-zend-expressive-zendviewrouter.spec deleted file mode 100644 index b2f9c85..0000000 --- a/php-zendframework-zend-expressive-zendviewrouter.spec +++ /dev/null @@ -1,157 +0,0 @@ -# remirepo/Fedora spec file for php-zendframework-zend-expressive-zendrouter -# -# Copyright (c) 2016 Remi Collet -# License: CC-BY-SA -# http://creativecommons.org/licenses/by-sa/4.0/ -# -# Please, preserve the changelog entries -# -%global bootstrap 0 -%global gh_commit 0fd6c5f6b22b614960a94beceaa58742444f84b4 -%global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_owner zendframework -%global gh_project zend-expressive-zendrouter -%global php_home %{_datadir}/php -%global library Expressive -%global sublib Router -%if %{bootstrap} -%global with_tests 0%{?_with_tests:1} -%else -%global with_tests 0%{!?_without_tests:1} -%endif - -Name: php-%{gh_owner}-%{gh_project} -Version: 1.1.0 -Release: 1%{?dist} -Summary: zend-mvc router support for %{library} - -Group: Development/Libraries -License: BSD -URL: https://framework.zend.com/ -Source0: %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz -Source1: makesrc.sh - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildArch: noarch -# Tests -%if %{with_tests} -BuildRequires: php(language) >= 5.5 -BuildRequires: php-composer(%{gh_owner}/zend-expressive-router) >= 1.0 -BuildRequires: php-composer(%{gh_owner}/zend-router) >= 2.5 -BuildRequires: php-composer(%{gh_owner}/zend-psr7bridge) >= 0.2.0 -BuildRequires: php-pcre -# From composer, "require-dev": { -# "phpunit/phpunit": "^4.7", -# "squizlabs/php_codesniffer": "^2.3" -BuildRequires: php-composer(phpunit/phpunit) >= 4.7 -# Autoloader -BuildRequires: php-composer(%{gh_owner}/zend-loader) >= 2.5 -%endif - -# From composer, "require": { -# "php": "^5.5 || ^7.0", -# "psr/http-message": "^1.0", -# "zendframework/zend-expressive-router": "^1.0", -# "zendframework/zend-router": "^2.5", -# "zendframework/zend-psr7bridge": "^0.2.0" -Requires: php(language) >= 5.5 -Requires: php-composer(psr/http-message) >= 1.0 -Requires: php-composer(psr/http-message) < 2 -Requires: php-composer(%{gh_owner}/zend-expressive-router) >= 1.0 -Requires: php-composer(%{gh_owner}/zend-expressive-router) < 2 -Requires: php-composer(%{gh_owner}/zend-router) >= 2.5 -Requires: php-composer(%{gh_owner}/zend-router) < 3 -Requires: php-composer(%{gh_owner}/zend-psr7bridge) >= 0.2.0 -Requires: php-composer(%{gh_owner}/zend-psr7bridge) < 1 -# From phpcompatinfo report for version 1.2.0 -Requires: php-pcre -%if ! %{bootstrap} -# Autoloader -Requires: php-composer(%{gh_owner}/zend-loader) >= 2.5 -Requires: php-zendframework-zend-loader >= 2.5.1-3 -%endif - -Provides: php-composer(%{gh_owner}/%{gh_project}) = %{version} - - -%description -Provides ZF2's MVC router integration for zend-expressive. - -Documentation: -https://zendframework.github.io/zend-expressive/features/router/zf2/ - - -%prep -%setup -q -n %{gh_project}-%{gh_commit} - -mv LICENSE.md LICENSE - -# psr/http-message load by zend-expressive-router - - -%build -# Empty build section, nothing required - - -%install -rm -rf %{buildroot} - -mkdir -p %{buildroot}%{php_home}/Zend/%{library} -cp -pr src %{buildroot}%{php_home}/Zend/%{library}/%{sublib} - - -%check -%if %{with_tests} -mkdir vendor -cat << 'EOF' | tee vendor/autoload.php - array( - 'namespaces' => array( - 'ZendTest\\%{library}\\%{sublib}' => dirname(__DIR__).'/test/', - 'Zend\\%{library}\\%{sublib}' => '%{buildroot}%{php_home}/Zend/%{library}/%{sublib}' -)))); -require_once '%{php_home}/Zend/autoload.php'; -EOF - -# remirepo:11 -run=0 -ret=0 -if which php56; then - php56 %{_bindir}/phpunit --verbose || ret=1 - run=1 -fi -if which php71; then - php70 %{_bindir}/phpunit --verbose || ret=1 - run=1 -fi -if [ $run -eq 0 ]; then -%{_bindir}/phpunit --verbose -# remirepo:2 -fi -exit $ret -%else -: Test suite disabled -%endif - - -%clean -rm -rf %{buildroot} - - -%files -%defattr(-,root,root,-) -%{!?_licensedir:%global license %%doc} -%license LICENSE -%doc *.md -%doc composer.json -%{php_home}/Zend/%{library}/%{sublib}/Zend* - - -%changelog -* Fri Jul 1 2016 Remi Collet - 1.1.0-1 -- initial package - -- cgit