From 1686a829a334a3c33f6ea82e4eb614f0bab1434a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 11 Aug 2017 19:12:02 +0200 Subject: v2.6.1 --- .gitignore | 7 +++++++ php-zendframework-zend-xmlrpc.spec | 27 ++++++++++++--------------- 2 files changed, 19 insertions(+), 15 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1ab5c4f --- /dev/null +++ b/.gitignore @@ -0,0 +1,7 @@ +package-*.xml +*.tgz +*.tar.gz +*.tar.xz +*.tar.xz.asc +*.src.rpm +*/*rpm diff --git a/php-zendframework-zend-xmlrpc.spec b/php-zendframework-zend-xmlrpc.spec index 4f365f2..e6974c2 100644 --- a/php-zendframework-zend-xmlrpc.spec +++ b/php-zendframework-zend-xmlrpc.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 04f5c91e4d15ab8ca379877ec962589c5e9b66d7 +%global gh_commit b41116f63a0c73c6efc33c3b2f912e868e7172fe %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zendframework %global gh_project zend-xmlrpc @@ -20,7 +20,7 @@ %endif Name: php-%{gh_owner}-%{gh_project} -Version: 2.6.0 +Version: 2.6.1 Release: 1%{?dist} Summary: Zend Framework %{library} component @@ -30,7 +30,6 @@ URL: https://zendframework.github.io/%{gh_project}/ Source0: %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch # Tests %if %{with_tests} @@ -119,8 +118,6 @@ mv LICENSE.md LICENSE %install -rm -rf %{buildroot} - mkdir -p %{buildroot}%{php_home}/Zend/ cp -pr src %{buildroot}%{php_home}/Zend/%{library} @@ -141,22 +138,19 @@ require_once '%{php_home}/Zend/autoload.php'; require_once 'test/TestAsset/functions.php'; EOF -%{_bindir}/phpunit --include-path=%{buildroot}%{php_home} - -if which php70; then - php70 %{_bindir}/phpunit --include-path=%{buildroot}%{php_home} -fi +ret=0 +for cmd in php php56 php70 php71 php72; do + if which $cmd; then + $cmd %{_bindir}/phpunit --include-path=%{buildroot}%{php_home} || ret=1 + fi +done +exit $ret %else : Test suite disabled %endif -%clean -rm -rf %{buildroot} - - %files -%defattr(-,root,root,-) %{!?_licensedir:%global license %%doc} %license LICENSE %doc *.md @@ -165,6 +159,9 @@ rm -rf %{buildroot} %changelog +* Fri Aug 11 2017 Remi Collet - 2.6.1-1 +- Update to 2.6.1 + * Tue Jun 21 2016 Remi Collet - 2.6.0-1 - update to 2.6.0 - raise dependency on PHP 5.6 -- cgit