update to 4.0.1

sources from git snapshot
drop patch merged upstream

2 files changed, 41 insertions, 11 deletions

diff --git a/makesrc.sh b/makesrc.sh
new file mode 100755
index 0000000..4190c13
--- /dev/null
+++ b/makesrc.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+NAME=$(basename $PWD)
+OWNER=$(sed   -n '/^%global gh_owner/{s/.* //;p}'   $NAME.spec)
+PROJECT=$(sed -n '/^%global gh_project/{s/.* //;p}' $NAME.spec)
+VERSION=$(sed -n '/^Version:/{s/.* //;p}'           $NAME.spec)
+COMMIT=$(sed  -n '/^%global gh_commit/{s/.* //;p}'  $NAME.spec)
+SHORT=${COMMIT:0:7}
+
+echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION\n"
+
+echo "Cloning..."
+rm -rf $PROJECT-$COMMIT
+git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT
+
+echo "Getting commit..."
+pushd $PROJECT-$COMMIT
+git checkout $COMMIT
+cp composer.json ../composer.json
+popd
+
+echo "Archiving..."
+tar czf $NAME-$VERSION-$SHORT.tgz --exclude-vcs --exclude tools $PROJECT-$COMMIT
+
+echo "Cleaning..."
+rm -rf $PROJECT-$COMMIT
+
+echo "Done."
diff --git a/php-sebastian-object-enumerator4.spec b/php-sebastian-object-enumerator4.spec
index f8eb3bb..9f16ddc 100644
--- a/php-sebastian-object-enumerator4.spec
+++ b/php-sebastian-object-enumerator4.spec
@@ -7,7 +7,7 @@
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    e67516b175550abad905dc952f43285957ef4363
+%global gh_commit    15f319d67c49fc55ebcdbffb3377433125588455
 #global gh_date      20150728
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     sebastianbergmann
@@ -27,17 +27,15 @@
 %endif
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
-Version:        4.0.0
+Version:        4.0.1
 %global specrel 1
 Release:        %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}
 Summary:        Traverses array and object to enumerate all referenced objects
 
 License:        BSD
 URL:            https://github.com/%{gh_owner}/%{gh_project}
-Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz
-
-# fix for PHPUnit 8/9
-Patch0:         https://patch-diff.githubusercontent.com/raw/sebastianbergmann/object-enumerator/pull/8.patch
+Source0:        %{name}-%{version}-%{gh_short}.tgz
+Source1:        makesrc.sh
 
 BuildArch:      noarch
 BuildRequires:  php(language) >= 7.3
@@ -54,8 +52,7 @@ BuildRequires:  php-sebastian-recursion-context4
 %endif
 # From composer.json"require-dev": {
 #        "phpunit/phpunit": "^9.0"
-# TODO test suite passes with v8, switch to v9 when available
-BuildRequires:  phpunit8
+BuildRequires:  phpunit9
 %endif
 
 # from composer.json
@@ -89,7 +86,7 @@ Autoloader: %{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php
 
 %prep
 %setup -q -n %{gh_project}-%{gh_commit}
-%patch0 -p1 -b .pr8
+
 
 %build
 # Generate the Autoloader, from composer.json "autoload": {
@@ -116,10 +113,10 @@ mkdir vendor
 
 : Run upstream test suite
 ret=0
-for cmd in php php73 php74; do
+for cmd in php php73 php74 php80; do
   if which $cmd; then
    $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \
-     %{_bindir}/phpunit8 --verbose || ret=1
+     %{_bindir}/phpunit9 --verbose || ret=1
   fi
 done
 exit $ret
@@ -137,6 +134,11 @@ exit $ret
 
 
 %changelog
+* Tue Jun 16 2020 Remi Collet <remi@remirepo.net> - 4.0.1-1
+- update to 4.0.1
+- sources from git snapshot
+- drop patch merged upstream
+
 * Fri Feb  7 2020 Remi Collet <remi@remirepo.net> - 4.0.0-1
 - update to 4.0.0
 - raise dependency on PHP 7.3