From 5710371f1a3a74f8e9931b2f207676fd898645a6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 21 Aug 2019 16:39:47 +0200 Subject: - update to 2.8.2 - use range dependencies --- .gitignore | 8 +++++++ composer.json | 43 ++++++++++++++++++---------------- php-zendframework-zend-paginator.spec | 44 +++++++++++++++++++++++++++++++---- 3 files changed, 70 insertions(+), 25 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..fc9aa8c --- /dev/null +++ b/.gitignore @@ -0,0 +1,8 @@ +clog +package-*.xml +*.tgz +*.tar.gz +*.tar.xz +*.tar.xz.asc +*.src.rpm +*/*rpm diff --git a/composer.json b/composer.json index f0b6c7a..4ad9e73 100644 --- a/composer.json +++ b/composer.json @@ -1,22 +1,19 @@ { "name": "zendframework/zend-paginator", - "description": "zend-paginator is a flexible component for paginating collections of data and presenting that data to users.", + "description": "Paginate collections of data from arbitrary sources", "license": "BSD-3-Clause", "keywords": [ - "zf2", + "zendframework", + "zf", "paginator" ], - "homepage": "https://github.com/zendframework/zend-paginator", "support": { - "docs": "https://docs.zendframework.com/zend-paginator", - "forum": "https://discourse.zendframework.com", + "docs": "https://docs.zendframework.com/zend-paginator/", "issues": "https://github.com/zendframework/zend-paginator/issues", - "source": "https://github.com/zendframework/zend-paginator" - }, - "autoload": { - "psr-4": { - "Zend\\Paginator\\": "src/" - } + "source": "https://github.com/zendframework/zend-paginator", + "rss": "https://github.com/zendframework/zend-paginator/releases.atom", + "chat": "https://zendframework-slack.herokuapp.com", + "forum": "https://discourse.zendframework.com/c/questions/components" }, "require": { "php": "^7.0 || ^5.6", @@ -41,23 +38,29 @@ "zendframework/zend-servicemanager": "Zend\\ServiceManager component", "zendframework/zend-view": "Zend\\View component" }, - "minimum-stability": "dev", - "prefer-stable": true, + "autoload": { + "psr-4": { + "Zend\\Paginator\\": "src/" + } + }, + "autoload-dev": { + "psr-4": { + "ZendTest\\Paginator\\": "test/" + } + }, + "config": { + "sort-packages": true + }, "extra": { "branch-alias": { - "dev-master": "2.8-dev", - "dev-develop": "2.9-dev" + "dev-master": "2.8.x-dev", + "dev-develop": "2.9.x-dev" }, "zf": { "component": "Zend\\Paginator", "config-provider": "Zend\\Paginator\\ConfigProvider" } }, - "autoload-dev": { - "psr-4": { - "ZendTest\\Paginator\\": "test/" - } - }, "scripts": { "check": [ "@cs-check", diff --git a/php-zendframework-zend-paginator.spec b/php-zendframework-zend-paginator.spec index 3054300..269aeec 100644 --- a/php-zendframework-zend-paginator.spec +++ b/php-zendframework-zend-paginator.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit fd58828c8280a90f133b9e0af2fe1a7885d47206 +%global gh_commit 2b4d07d9475ed581278a28d065b238a0941402e2 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zendframework %global gh_project zend-paginator @@ -20,11 +20,10 @@ %endif Name: php-%{gh_owner}-%{gh_project} -Version: 2.8.1 +Version: 2.8.2 Release: 2%{?dist} Summary: Zend Framework %{library} component -Group: Development/Libraries License: BSD URL: https://zendframework.github.io/%{gh_project}/ Source0: %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz @@ -35,7 +34,14 @@ BuildArch: noarch %if %{with_tests} BuildRequires: php(language) >= 5.6 BuildRequires: php-spl +# remirepo:1 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +BuildRequires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 with php-autoloader(%{gh_owner}/zend-stdlib) < 4) +# remirepo:4 +%else +BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) < 4 BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 +%endif # From composer, "require-dev": { # "phpunit/phpunit": "^6.2.1 || ^5.7.15", # "zendframework/zend-cache": "^2.6.1", @@ -46,13 +52,32 @@ BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 # "zendframework/zend-json": "^2.6.1", # "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", # "zendframework/zend-view": "^2.6.3" +# remirepo:1 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +BuildRequires: (php-autoloader(%{gh_owner}/zend-cache) >= 2.6.1 with php-autoloader(%{gh_owner}/zend-cache) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/zend-config) >= 2.6.0 with php-autoloader(%{gh_owner}/zend-config) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/zend-db) >= 2.9.2 with php-autoloader(%{gh_owner}/zend-db) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/zend-filter) >= 2.6.1 with php-autoloader(%{gh_owner}/zend-filter) < 3) +# ignore max version as test suite passes with 3.1.1 +BuildRequires: php-autoloader(%{gh_owner}/zend-json) >= 2.6.1 +BuildRequires: (php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.5 with php-autoloader(%{gh_owner}/zend-servicemanager) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/zend-view) >= 2.6.3 with php-autoloader(%{gh_owner}/zend-view) < 3) +# remirepo:15 +%else +BuildRequires: php-autoloader(%{gh_owner}/zend-cache) < 3 BuildRequires: php-autoloader(%{gh_owner}/zend-cache) >= 2.6.1 +BuildRequires: php-autoloader(%{gh_owner}/zend-config) < 3 BuildRequires: php-autoloader(%{gh_owner}/zend-config) >= 2.6.0 +BuildRequires: php-autoloader(%{gh_owner}/zend-db) < 3 BuildRequires: php-autoloader(%{gh_owner}/zend-db) >= 2.9.2 +BuildRequires: php-autoloader(%{gh_owner}/zend-filter) < 3 BuildRequires: php-autoloader(%{gh_owner}/zend-filter) >= 2.6.1 BuildRequires: php-autoloader(%{gh_owner}/zend-json) >= 2.6.1 +BuildRequires: php-autoloader(%{gh_owner}/zend-servicemanager) < 4 BuildRequires: php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.5 +BuildRequires: php-autoloader(%{gh_owner}/zend-view) < 3 BuildRequires: php-autoloader(%{gh_owner}/zend-view) >= 2.6.3 +%endif BuildRequires: phpunit6 >= 6.2.1 %endif # Autoloader @@ -63,8 +88,13 @@ BuildRequires: php-fedora-autoloader-devel # "zendframework/zend-stdlib": "^2.7 || ^3.0" Requires: php(language) >= 5.6 %if ! %{bootstrap} -Requires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +Requires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 with php-autoloader(%{gh_owner}/zend-stdlib) < 4) +# remirepo:4 +%else Requires: php-autoloader(%{gh_owner}/zend-stdlib) < 4 +Requires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 +%endif # From composer, "suggest": { # "zendframework/zend-cache": "Zend\\Cache component to support cache features", # "zendframework/zend-db": "Zend\\Db component", @@ -141,7 +171,7 @@ require_once '%{buildroot}%{php_home}/Zend/%{library}/autoload.php'; EOF ret=0 -for cmd in php php70 php71 php72; do +for cmd in php php71 php72 php73 php74; do if which $cmd; then $cmd %{_bindir}/phpunit6 --verbose || ret=1 fi @@ -161,6 +191,10 @@ exit $ret %changelog +* Wed Aug 21 2019 Remi Collet - 2.8.2-2 +- update to 2.8.2 +- use range dependencies + * Wed Jan 31 2018 Remi Collet - 2.8.1-1 - Update to 2.8.1 -- cgit