summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--php-akamai-open-edgegrid-auth.spec28
1 files changed, 22 insertions, 6 deletions
diff --git a/php-akamai-open-edgegrid-auth.spec b/php-akamai-open-edgegrid-auth.spec
index d4cc742..2d10a25 100644
--- a/php-akamai-open-edgegrid-auth.spec
+++ b/php-akamai-open-edgegrid-auth.spec
@@ -28,7 +28,7 @@
Name: php-%{composer_vendor}-%{composer_project}
Version: %{github_version}
-Release: 1%{?github_release}%{?dist}
+Release: 2%{?github_release}%{?dist}
Summary: Implements the Akamai {OPEN} EdgeGrid Authentication
Group: Development/Libraries
@@ -39,7 +39,7 @@ Source0: %{url}/archive/%{github_commit}/%{name}-%{github_version}-%{githu
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
# Autoloader
-BuildRequires: %{_bindir}/phpab
+BuildRequires: php-fedora-autoloader-devel
# Tests
%if %{with_tests}
## composer.json
@@ -59,6 +59,8 @@ Requires: php(language) >= %{php_min_ver}
Requires: php-date
Requires: php-hash
Requires: php-pcre
+# Autoloader
+Requires: php-composer(fedora/autoloader)
# Weak dependencies
%if 0%{?fedora} >= 21
@@ -87,7 +89,7 @@ Autoloader: %{phpdir}/Akamai/Open/EdgeGrid/autoload-auth.php
%build
: Create autoloader
-%{_bindir}/phpab --output src/autoload-auth.php src/
+%{_bindir}/phpab --template fedora --output src/autoload-auth.php src/
%install
@@ -102,20 +104,29 @@ cp -rp src/* %{buildroot}%{phpdir}/Akamai/Open/EdgeGrid/
: Remove logging from PHPUnit config
sed '/log/d' phpunit.xml.dist > phpunit.xml
+%if 0%{?fedora} > 25
+: Temporarily skip test known to fail for PHP 7.1
+: See https://github.com/akamai-open/AkamaiOPEN-edgegrid-php/issues/2
+sed 's/function testTimestampFormat/function SKIP_testTimestampFormat/' \
+ -i tests/Authentication/TimestampTest.php
+%endif
+
+# remirepo:11
run=0
ret=0
if which php56; then
php56 %{_bindir}/phpunit --bootstrap %{buildroot}%{phpdir}/Akamai/Open/EdgeGrid/autoload-auth.php || ret=1
run=1
fi
-if which php70; then
- # PHP 7.1 => 1 failure: Akamai\Open\EdgeGrid\Tests\Client\Authentication\TimestampTest::testTimestampFormat
- php70 %{_bindir}/phpunit --bootstrap %{buildroot}%{phpdir}/Akamai/Open/EdgeGrid/autoload-auth.php || ret=1
+if which php71; then
+ sed 's/function testTimestampFormat/function SKIP_testTimestampFormat/' -i tests/Authentication/TimestampTest.php
+ php71 %{_bindir}/phpunit --bootstrap %{buildroot}%{phpdir}/Akamai/Open/EdgeGrid/autoload-auth.php || ret=1
run=1
fi
if [ $run -eq 0 ]; then
%{_bindir}/phpunit --verbose \
--bootstrap %{buildroot}%{phpdir}/Akamai/Open/EdgeGrid/autoload-auth.php
+# remirepo:2
fi
exit $ret
%else
@@ -142,6 +153,11 @@ rm -rf %{buildroot}
%changelog
+* Fri Dec 09 2016 Shawn Iwinski <shawn@iwin.ski> - 0.6.0-2
+- Temporarily skip test known to fail for PHP 7.1 (see
+ https://github.com/akamai-open/AkamaiOPEN-edgegrid-php/issues/2 )
+- Use php-composer(fedora/autoloader)
+
* Fri Oct 21 2016 Remi Collet <remim@remirepo.net> - 0.6.0-1
- add backport stuff