From e7ab143aa10f8204b07beb70f98544c7e9a9fa32 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 17 Mar 2020 16:31:06 +0100 Subject: [PATCH 1/5] v8.5.3 own /usr/share/php/PHPUnit8/Extensions (cherry picked from commit e7a8884a192fa8a6707d5a3bccfcede4e18b0d3c) (cherry picked from commit f01ffa62d4a7f66473b45822b3819f222ce69f38) --- phpunit8.spec | 13 +++++++++++-- sources | 2 +- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/phpunit8.spec b/phpunit8.spec index e2f6888..43c4294 100644 --- a/phpunit8.spec +++ b/phpunit8.spec @@ -11,7 +11,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 018b6ac3c8ab20916db85fa91bf6465acb64d1e0 +%global gh_commit 67750516bc02f300e2742fed2f50177f8f37bedf #global gh_date 20150927 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_vendor sebastianbergmann @@ -24,7 +24,7 @@ %global php_home %{_datadir}/php %global ver_major 8 %global ver_minor 5 -%global ver_patch 2 +%global ver_patch 3 %global specrel 1 Name: %{pk_project}%{ver_major} @@ -189,6 +189,10 @@ cat << 'EOF' | tee -a src/autoload.php '%{php_home}/PharIo/Manifest/autoload.php', '%{php_home}/PharIo/Version/autoload.php', ]); +// Extensions +\Fedora\Autoloader\Dependencies::optional( + glob("%{php_home}/%{ns_vendor}/Extensions/*/autoload.php") +); EOF cat src/autoload.php @@ -204,6 +208,7 @@ cat src/autoload.php %install mkdir -p %{buildroot}%{php_home} cp -pr src %{buildroot}%{php_home}/%{ns_vendor} +mkdir %{buildroot}%{php_home}/%{ns_vendor}/Extensions install -D -p -m 755 phpunit %{buildroot}%{_bindir}/%{name} install -p -m 644 phpunit.xsd %{buildroot}%{php_home}/%{ns_vendor}/phpunit.xsd @@ -232,6 +237,10 @@ exit $ret %changelog +* Tue Mar 31 2020 Remi Collet - 8.5.3-1 +- update to 8.5.3 +- own /usr/share/php/PHPUnit8/Extensions + * Wed Jan 8 2020 Remi Collet - 8.5.2-1 - update to 8.5.2 diff --git a/sources b/sources index 7cd7d85..84df3b7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit8-8.5.2-018b6ac.tar.gz) = 8f11ccd733740a1b9a926a11f5d070fb48cdc176416b3820e37611f11e8bc8bc92b29bcb985d6fcf1d9cc69a4ab1b75d25f8d039c9b686df492c196e9f7954fc +SHA512 (phpunit8-8.5.3-6775051.tar.gz) = bbdc197fe455bcf9731d1e0d1bc539a242b35ff9fe40a73701cda8ea005616c4f47afcb64f0a228f9668a543071fc3f54b9fd34aa757dfb1e8da2a4652d244b8 From eb6d531c2c783803aa11ee09f657c535249a3691 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 23 Apr 2020 09:16:10 +0200 Subject: [PATCH 2/5] v8.5.4 (cherry picked from commit f6f24d445793f0f9797a9d970fd1387004bd2fd4) --- phpunit8.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/phpunit8.spec b/phpunit8.spec index 43c4294..a69a71d 100644 --- a/phpunit8.spec +++ b/phpunit8.spec @@ -11,7 +11,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 67750516bc02f300e2742fed2f50177f8f37bedf +%global gh_commit 8474e22d7d642f665084ba5ec780626cbd1efd23 #global gh_date 20150927 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_vendor sebastianbergmann @@ -24,7 +24,7 @@ %global php_home %{_datadir}/php %global ver_major 8 %global ver_minor 5 -%global ver_patch 3 +%global ver_patch 4 %global specrel 1 Name: %{pk_project}%{ver_major} @@ -220,7 +220,7 @@ sed -e 's:@PATH@:%{buildroot}%{php_home}/%{ns_vendor}:' -i tests/bootstrap.php sed -e 's:%{php_home}/%{ns_vendor}:%{buildroot}%{php_home}/%{ns_vendor}:' -i phpunit ret=0 -for cmd in php php72 php73 php74; do +for cmd in php php72 php73 php74 php80; do if which $cmd; then $cmd ./phpunit $OPT --verbose || ret=1 fi @@ -237,6 +237,9 @@ exit $ret %changelog +* Thu Apr 23 2020 Remi Collet - 8.5.4-1 +- update to 8.5.4 + * Tue Mar 31 2020 Remi Collet - 8.5.3-1 - update to 8.5.3 - own /usr/share/php/PHPUnit8/Extensions diff --git a/sources b/sources index 84df3b7..e2562ab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit8-8.5.3-6775051.tar.gz) = bbdc197fe455bcf9731d1e0d1bc539a242b35ff9fe40a73701cda8ea005616c4f47afcb64f0a228f9668a543071fc3f54b9fd34aa757dfb1e8da2a4652d244b8 +SHA512 (phpunit8-8.5.4-8474e22.tar.gz) = ef95d618af84220fac4dfc1ae56c7e1be3bd153fe7afef8baa68547049f2a1d44ba097696cbdf85c55c2675d60a0b30a20f9513a906123e7ab20c934f7360bf5 From d1150ad561fadf36e213cce8eb34d019a9492984 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 25 May 2020 09:33:42 +0200 Subject: [PATCH 3/5] update to 8.5.5 sources from git snapshot (cherry picked from commit 95aa03e7d765d0f5435e4ea8757b38577cf7988d) --- .gitignore | 1 + makesrc.sh | 28 ++++++++++++++++++++++++++++ phpunit8.spec | 12 ++++++++---- sources | 2 +- 4 files changed, 38 insertions(+), 5 deletions(-) create mode 100755 makesrc.sh diff --git a/.gitignore b/.gitignore index 35b1a7e..08edfa5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ clog /phpunit8-8.*.tar.gz +/phpunit8-8.5.5-63dda3b.tgz diff --git a/makesrc.sh b/makesrc.sh new file mode 100755 index 0000000..8152336 --- /dev/null +++ b/makesrc.sh @@ -0,0 +1,28 @@ +#!/bin/bash + +NAME=$(basename $PWD) +OWNER=$(sed -n '/^%global gh_vendor/{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/phpunit8.spec b/phpunit8.spec index a69a71d..a459986 100644 --- a/phpunit8.spec +++ b/phpunit8.spec @@ -11,7 +11,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 8474e22d7d642f665084ba5ec780626cbd1efd23 +%global gh_commit 63dda3b212a0025d380a745f91bdb4d8c985adb7 #global gh_date 20150927 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_vendor sebastianbergmann @@ -24,17 +24,17 @@ %global php_home %{_datadir}/php %global ver_major 8 %global ver_minor 5 -%global ver_patch 4 %global specrel 1 Name: %{pk_project}%{ver_major} -Version: %{ver_major}.%{ver_minor}.%{ver_patch} +Version: 8.5.5 Release: %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist} Summary: The PHP Unit Testing framework version %{ver_major} License: BSD URL: https://github.com/%{gh_vendor}/%{gh_project} -Source0: https://github.com/%{gh_vendor}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz +Source0: %{name}-%{version}-%{gh_short}.tgz +Source1: makesrc.sh # Fix command for autoload Patch0: %{name}-rpm.patch @@ -237,6 +237,10 @@ exit $ret %changelog +* Sat May 23 2020 Remi Collet - 8.5.5-1 +- update to 8.5.5 +- sources from git snapshot + * Thu Apr 23 2020 Remi Collet - 8.5.4-1 - update to 8.5.4 diff --git a/sources b/sources index e2562ab..4f16ae7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit8-8.5.4-8474e22.tar.gz) = ef95d618af84220fac4dfc1ae56c7e1be3bd153fe7afef8baa68547049f2a1d44ba097696cbdf85c55c2675d60a0b30a20f9513a906123e7ab20c934f7360bf5 +SHA512 (phpunit8-8.5.5-63dda3b.tgz) = 6ddd792a3e13b1c6ea33d6b45f669916ecf1f4c2810aa9e23cb6d4a664d2aa60033118989ee6400621bbe7e930fc09c0443146f42bb98c2808c2bf03d27bf4fb From 80ce63521450167597d542f618e5ffdfbaac1ea6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 15 Jun 2020 14:39:31 +0200 Subject: [PATCH 4/5] v8.5.6 (cherry picked from commit e7962ccb353cfd05f118a4d278c6a401920320bb) --- .gitignore | 1 + phpunit8.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 08edfa5..a0a24c2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ clog /phpunit8-8.*.tar.gz /phpunit8-8.5.5-63dda3b.tgz +/phpunit8-8.5.6-3f9c407.tgz diff --git a/phpunit8.spec b/phpunit8.spec index a459986..0002aea 100644 --- a/phpunit8.spec +++ b/phpunit8.spec @@ -11,7 +11,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 63dda3b212a0025d380a745f91bdb4d8c985adb7 +%global gh_commit 3f9c4079d1407cd84c51c02c6ad1df6ec2ed1348 #global gh_date 20150927 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_vendor sebastianbergmann @@ -27,7 +27,7 @@ %global specrel 1 Name: %{pk_project}%{ver_major} -Version: 8.5.5 +Version: 8.5.6 Release: %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist} Summary: The PHP Unit Testing framework version %{ver_major} @@ -237,6 +237,9 @@ exit $ret %changelog +* Mon Jun 15 2020 Remi Collet - 8.5.6-1 +- update to 8.5.6 + * Sat May 23 2020 Remi Collet - 8.5.5-1 - update to 8.5.5 - sources from git snapshot diff --git a/sources b/sources index 4f16ae7..1b73a47 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit8-8.5.5-63dda3b.tgz) = 6ddd792a3e13b1c6ea33d6b45f669916ecf1f4c2810aa9e23cb6d4a664d2aa60033118989ee6400621bbe7e930fc09c0443146f42bb98c2808c2bf03d27bf4fb +SHA512 (phpunit8-8.5.6-3f9c407.tgz) = 71cc620940c1e1ae65cd3732c509e6da70038ebb29215bad6c7e95ef5a659af3fb168b3d43fc16acea7d72cbc994ff0badf7d799b13f78b11d8b36c0dbf7dddb From 1d00ac6807563105626e9736409770373de85726 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 22 Jun 2020 09:34:57 +0200 Subject: [PATCH 5/5] v8.5.8 (cherry picked from commit 5a497e7d690b781aaadb85307f13ccafb6b6dfe9) --- .gitignore | 1 + phpunit8.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a0a24c2..f000b96 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ clog /phpunit8-8.*.tar.gz /phpunit8-8.5.5-63dda3b.tgz /phpunit8-8.5.6-3f9c407.tgz +/phpunit8-8.5.8-34c18ba.tgz diff --git a/phpunit8.spec b/phpunit8.spec index 0002aea..60e6664 100644 --- a/phpunit8.spec +++ b/phpunit8.spec @@ -11,7 +11,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 3f9c4079d1407cd84c51c02c6ad1df6ec2ed1348 +%global gh_commit 34c18baa6a44f1d1fbf0338907139e9dce95b997 #global gh_date 20150927 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_vendor sebastianbergmann @@ -27,7 +27,7 @@ %global specrel 1 Name: %{pk_project}%{ver_major} -Version: 8.5.6 +Version: 8.5.8 Release: %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist} Summary: The PHP Unit Testing framework version %{ver_major} @@ -237,6 +237,9 @@ exit $ret %changelog +* Mon Jun 22 2020 Remi Collet - 8.5.8-1 +- update to 8.5.8 + * Mon Jun 15 2020 Remi Collet - 8.5.6-1 - update to 8.5.6 diff --git a/sources b/sources index 1b73a47..0714d80 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit8-8.5.6-3f9c407.tgz) = 71cc620940c1e1ae65cd3732c509e6da70038ebb29215bad6c7e95ef5a659af3fb168b3d43fc16acea7d72cbc994ff0badf7d799b13f78b11d8b36c0dbf7dddb +SHA512 (phpunit8-8.5.8-34c18ba.tgz) = 27d70638c60e8951d090bab61f7cb4017e7479930dc7dd83b708bffe23ba4c49b647d3ce2f73b01bf92d81a1cb0c56025ece999dae31076a71117ddda3dc7506