From 577908a77abe67495c4f0f5435c71c6ce076c523 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Sun, 2 Apr 2017 08:11:01 +0200
Subject: v2.8.0

---
 php-zendframework-zend-feed.spec | 67 ++++++++++++++++++++++++----------------
 1 file changed, 41 insertions(+), 26 deletions(-)

(limited to 'php-zendframework-zend-feed.spec')

diff --git a/php-zendframework-zend-feed.spec b/php-zendframework-zend-feed.spec
index 9180932..3479bf5 100644
--- a/php-zendframework-zend-feed.spec
+++ b/php-zendframework-zend-feed.spec
@@ -7,7 +7,7 @@
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    12b328d382aa5200f1de53d4147033b885776b67
+%global gh_commit    94579e805dd108683209fe14b3b5d4276de3de6e
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     zendframework
 %global gh_project   zend-feed
@@ -20,8 +20,8 @@
 %endif
 
 Name:           php-%{gh_owner}-%{gh_project}
-Version:        2.7.0
-Release:        2%{?dist}
+Version:        2.8.0
+Release:        1%{?dist}
 Summary:        Zend Framework %{library} component
 
 Group:          Development/Libraries
@@ -30,13 +30,11 @@ URL:            https://zendframework.github.io/%{gh_project}/
 Source0:        %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz
 Source1:        makesrc.sh
 
-Patch0:         %{name}-pr35.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch:      noarch
 # Tests
 %if %{with_tests}
-BuildRequires:  php(language) >= 5.5
+BuildRequires:  php(language) >= 5.6
 BuildRequires:  php-ctype
 BuildRequires:  php-date
 BuildRequires:  php-dom
@@ -48,21 +46,26 @@ BuildRequires:  php-tidy
 BuildRequires:  php-composer(%{gh_owner}/zend-escaper)          >= 2.5
 BuildRequires:  php-composer(%{gh_owner}/zend-stdlib)           >= 2.5
 # From composer, "require-dev": {
-#        "zendframework/zend-db": "^2.5",
-#        "zendframework/zend-cache": "^2.5",
-#        "zendframework/zend-http": "^2.5",
+#        "zendframework/zend-db": "^2.7",
+#        "zendframework/zend-cache": "^2.6",
+#        "zendframework/zend-http": "^2.5.4",
 #        "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
-#        "zendframework/zend-validator": "^2.5",
-#        "fabpot/php-cs-fixer": "1.7.*",
-#        "phpunit/PHPUnit": "~4.0",
-#        "psr/http-message": "^1.0"
-BuildRequires:  php-composer(%{gh_owner}/zend-db)               >= 2.5
-BuildRequires:  php-composer(%{gh_owner}/zend-cache)            >= 2.5
-BuildRequires:  php-composer(%{gh_owner}/zend-http)             >= 2.5
+#        "zendframework/zend-validator": "^2.6",
+#        "phpunit/PHPUnit": "^6.0.8 || ^5.7.15",
+#        "psr/http-message": "^1.0",
+#        "zendframework/zend-coding-standard": "~1.0.0"
+BuildRequires:  php-composer(%{gh_owner}/zend-db)               >= 2.7
+BuildRequires:  php-composer(%{gh_owner}/zend-cache)            >= 2.6
+BuildRequires:  php-composer(%{gh_owner}/zend-http)             >= 2.5.4
 BuildRequires:  php-composer(%{gh_owner}/zend-servicemanager)   >= 2.7.5
-BuildRequires:  php-composer(%{gh_owner}/zend-validator)        >= 2.5
-BuildRequires:  php-composer(phpunit/phpunit)                   >= 4.0
+BuildRequires:  php-composer(%{gh_owner}/zend-validator)        >= 2.6
 BuildRequires:  php-composer(psr/http-message)                  >= 1.0
+%if 0%{?fedora} >= 26
+%global phpunit %{_bindir}/phpunit6
+%else
+%global phpunit %{_bindir}/phpunit
+%endif
+BuildRequires:  %{phpunit}
 # Because of boostraped Db
 BuildRequires:  php-composer(%{gh_owner}/zend-eventmanager)   >= 2.5
 # Autoloader
@@ -70,10 +73,10 @@ BuildRequires:  php-composer(%{gh_owner}/zend-loader)           >= 2.5
 %endif
 
 # From composer, "require": {
-#        "php": "^5.5 || ^7.0",
+#        "php": "^5.6 || ^7.0",
 #        "zendframework/zend-escaper": "^2.5",
-#        "zendframework/zend-stdlib": "^2.7 || ^3.0"
-Requires:       php(language) >= 5.5
+#        "zendframework/zend-stdlib": "^2.7 || ^3.1"
+Requires:       php(language) >= 5.6
 %if ! %{bootstrap}
 Requires:       php-composer(%{gh_owner}/zend-escaper)          >= 2.5
 Requires:       php-composer(%{gh_owner}/zend-escaper)          <  3
@@ -122,12 +125,14 @@ Documentation: https://zendframework.github.io/%{gh_project}/
 
 %prep
 %setup -q -n %{gh_project}-%{gh_commit}
-%patch0 -p1
 
 mv LICENSE.md LICENSE
 
-# NOTICE: psr/http-message is PSR-0 compliant
-# autoload will be managed by fallback_autoloader
+: Create dependency autoloader
+cat << 'EOF' | tee autoload.php
+<?php
+require_once '%{php_home}/Psr/Http/Message/autoload.php';
+EOF
 
 
 %build
@@ -140,12 +145,16 @@ rm -rf %{buildroot}
 mkdir -p   %{buildroot}%{php_home}/Zend/
 cp -pr src %{buildroot}%{php_home}/Zend/%{library}
 
+install -m644 autoload.php %{buildroot}%{php_home}/Zend/%{library}-autoload.php
+
 
 %check
 %if %{with_tests}
 mkdir vendor
 cat << 'EOF' | tee vendor/autoload.php
 <?php
+define('RPM_BUILDROOT', '%{buildroot}%{php_home}/Zend');
+
 require_once '%{php_home}/Zend/Loader/AutoloaderFactory.php';
 Zend\Loader\AutoloaderFactory::factory(array(
     'Zend\Loader\StandardAutoloader' => array(
@@ -168,11 +177,11 @@ if which php56; then
    run=1
 fi
 if which php71; then
-   php70 %{_bindir}/phpunit || ret=1
+   php71 %{_bindir}/phpunit6 || ret=1
    run=1
 fi
 if [ $run -eq 0 ]; then
-%{_bindir}/phpunit --verbose
+%{phpunit} --verbose
 # remirepo:2
 fi
 exit $ret
@@ -192,9 +201,15 @@ rm -rf %{buildroot}
 %doc *.md
 %doc composer.json
 %{php_home}/Zend/%{library}
+%{php_home}/Zend/%{library}-autoload.php
 
 
 %changelog
+* Sun Apr  2 2017 Remi Collet <remi@remirepo.net> - 2.8.0-1
+- Update to 2.8.0
+- raise dependency on PHP 5.6
+- use phpunit6 on F26+
+
 * Tue Nov 15 2016 Remi Collet <remi@fedoraproject.org> - 2.7.0-2
 - add path for PHP 7.1
   open https://github.com/zendframework/zend-feed/pull/35
-- 
cgit