test build

2 files changed, 49 insertions, 14 deletions

diff --git a/31.patch b/31.patch
new file mode 100644
index 0000000..026235a
--- /dev/null
+++ b/31.patch
@@ -0,0 +1,31 @@
+From 5d5c1f1e5074b69bb4bc5eb0d5be7abe06f9f94d Mon Sep 17 00:00:00 2001
+From: Marc Bennewitz <marc@mabe.berlin>
+Date: Sun, 5 Nov 2017 15:36:54 +0100
+Subject: [PATCH] fixed #30 - wrong use of variable variables
+
+---
+ src/Adapter/PythonPickle.php | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/Adapter/PythonPickle.php b/src/Adapter/PythonPickle.php
+index 75f6cbe..b7665a4 100644
+--- a/src/Adapter/PythonPickle.php
++++ b/src/Adapter/PythonPickle.php
+@@ -911,7 +911,7 @@ protected function loadLong4()
+     {
+         $nBin = $this->read(4);
+         if (static::$isLittleEndian === false) {
+-            $nBin = strrev($$nBin);
++            $nBin = strrev($nBin);
+         }
+         list(, $n) = unpack('l', $nBin);
+         $data = $this->read($n);
+@@ -984,7 +984,7 @@ protected function loadBinBytes()
+         // read byte length
+         $nBin = $this->read(4);
+         if (static::$isLittleEndian === false) {
+-            $nBin = strrev($$nBin);
++            $nBin = strrev($nBin);
+         }
+         list(, $n)     = unpack('l', $nBin);
+         $this->stack[] = $this->read($n);
diff --git a/php-zendframework-zend-serializer.spec b/php-zendframework-zend-serializer.spec
index d0a85a7..32799ed 100644
--- a/php-zendframework-zend-serializer.spec
+++ b/php-zendframework-zend-serializer.spec
@@ -19,9 +19,12 @@
 %global with_tests   0%{!?_without_tests:1}
 %endif
 
+#global debug_package %{nil}
+#global __debug_install_post /bin/true
+
 Name:           php-%{gh_owner}-%{gh_project}
 Version:        2.8.0
-Release:        1%{?dist}
+Release:        4%{?dist}
 Summary:        Zend Framework %{library} component
 
 Group:          Development/Libraries
@@ -30,7 +33,8 @@ URL:            https://zendframework.github.io/%{gh_project}/
 Source0:        %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz
 Source1:        makesrc.sh
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
+Patch0:         https://patch-diff.githubusercontent.com/raw/zendframework/zend-serializer/pull/31.patch
+
 BuildArch:      noarch
 # Tests
 %if %{with_tests}
@@ -96,6 +100,7 @@ Documentation: https://zendframework.github.io/%{gh_project}/
 
 %prep
 %setup -q -n %{gh_project}-%{gh_commit}
+%patch0 -p1
 
 mv LICENSE.md LICENSE
 
@@ -105,8 +110,6 @@ mv LICENSE.md LICENSE
 
 
 %install
-rm -rf %{buildroot}
-
 mkdir -p   %{buildroot}%{php_home}/Zend/
 cp -pr src %{buildroot}%{php_home}/Zend/%{library}
 
@@ -126,22 +129,19 @@ Zend\Loader\AutoloaderFactory::factory(array(
 require_once '%{php_home}/Zend/autoload.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 || 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
@@ -150,6 +150,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Nov  8 2017 Remi Collet <remi@fedoraproject.org> - 2.8.0-4
+- test build: fix FTBFS from Koschei, add patch for bigendian from
+  https://github.com/zendframework/zend-serializer/pull/31
+
 * Tue Jun 21 2016 Remi Collet <remi@fedoraproject.org> - 2.8.0-1
 - update to 2.8.0
 - raise dependency on PHP 5.6