From e0d6c8922d95cf0249fa12a9fdc95f9d2a0c0c20 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 13 Dec 2022 08:21:10 +0100 Subject: add missing r62 --- buildfct | 34 ++++++++++++++++++++++++++++++++-- getmock | 1 + mkmodular | 8 +++++--- 3 files changed, 38 insertions(+), 5 deletions(-) diff --git a/buildfct b/buildfct index 6a26bc0..d8106ec 100644 --- a/buildfct +++ b/buildfct @@ -280,7 +280,7 @@ fi } # Build All distribution / version / noarch for remi using PHP >= 7.4 -mock74n() +mock80n() { quiet="--quiet" if [ "$1" = "-q" ]; then @@ -297,7 +297,7 @@ if [ -f "$1" ]; then pids="$pids $!" done echo -n "" - (mock $quiet --configdir=$mocketc -r el7x --enablerepo=remi-php74 rebuild "$@" && echo "$(date +%X) (74) el7 Ok." || echo "el7 Error !")& + (mock $quiet --configdir=$mocketc -r el7x --enablerepo=remi-php80 rebuild "$@" && echo "$(date +%X) (74) el7 Ok." || echo "el7 Error !")& pids="$pids $!" echo -n "" (mock $quiet --configdir=$mocketc -r el8x rebuild "$@" && echo "$(date +%X) (74) el8 Ok." || echo "el8 Error !")& @@ -537,6 +537,34 @@ else fi } +# Build All distribution / version / 64bits for redis:remi-6.2 +mockr62x() +{ +quiet="" +if [ "$1" = "-q" ]; then + quiet="--quiet" + shift +fi + +if [ -f "$1" ]; then + echo -n "$(date +%X) r62 f37 " + mock $quiet --configdir=$mocketc -r fc37xr62 rebuild "$@" && echo " Ok." || echo " Error !" + echo -n "$(date +%X) r62 f36 " + mock $quiet --configdir=$mocketc -r fc36xr62 rebuild "$@" && echo " Ok." || echo " Error !" + echo -n "$(date +%X) r62 f35 " + mock $quiet --configdir=$mocketc -r fc35x rebuild "$@" && echo " Ok." || echo " Error !" + echo -n "$(date +%X) r62 el9 " + mock $quiet --configdir=$mocketc -r el9xr62 rebuild "$@" && echo " Ok." || echo " Error !" + echo -n "$(date +%X) r62 el8 " + mock $quiet --configdir=$mocketc -r el8xr62 rebuild "$@" && echo " Ok." || echo " Error !" + echo -n "$(date +%X) r62 el7 " + mock $quiet --configdir=$mocketc -r el7x rebuild "$@" && echo " Ok." || echo " Error !" + date +%X +else + echo "file not found '$1'" +fi +} + # Build All distribution / version / 64bits for redis:remi-7.0 mockr70x() { @@ -547,6 +575,8 @@ if [ "$1" = "-q" ]; then fi if [ -f "$1" ]; then + echo -n "$(date +%X) r70 f37 " + mock $quiet --configdir=$mocketc -r fc37xr70 rebuild "$@" && echo " Ok." || echo " Error !" echo -n "$(date +%X) r70 f36 " mock $quiet --configdir=$mocketc -r fc36xr70 rebuild "$@" && echo " Ok." || echo " Error !" echo -n "$(date +%X) r70 f35 " diff --git a/getmock b/getmock index c4cf757..6fb1ebd 100755 --- a/getmock +++ b/getmock @@ -497,6 +497,7 @@ elif [ $1 = allr70 ]; then getOneMock fc35x $opt '*7.0*' getOneMock el7x $opt '*7.0*' opt=redis70 + getOneMock fc37x $opt '*7.0*' getOneMock fc36x $opt '*7.0*' getOneMock el8x $opt '*7.0*' getOneMock el9x $opt '*7.0*' diff --git a/mkmodular b/mkmodular index 745c597..be25220 100755 --- a/mkmodular +++ b/mkmodular @@ -245,12 +245,14 @@ function findPackages($from, $dest, $pat) { global $oldrpms; $excl = [ 'php-amqplib', 'php-jsonlint', 'php-cs-fixer', 'php-tecnickcom-tc-lib-unicode-data', - 'php-doctrine-orm', 'php-pear-phing', + 'php-doctrine-orm', 'php-pear-phing', 'php-doctrine-collections', 'php-laminas-i18n', 'php-laminas-mail', 'php-laminas-authentication', 'php-laminas-diactoros2', 'php-laminas-mime', 'php-laminas-i18n-resources', 'php-laminas-memory', 'php-laminas-test', 'php-laminas-validator', 'php-laminas-view', + 'php-laminas-eventmanager', 'php-laminas-form3', 'php-laminas-config3', 'php-laminas-http', 'php-laminas-navigation', + 'php-laminas-psr7bridge', 'php-laminas-inputfilter', 'php-laminas-crypt', 'php-laminas-di3', 'php-laminas-mvc-plugin-flashmessenger', - 'php-react-promise-timer', 'php-laminas-filter', 'php-laminas-router', - 'php-icewind-streams', 'php-masterminds-html5', 'php-league-mime-type-detection', + 'php-react-promise-timer', 'php-laminas-filter', 'php-laminas-router', 'php-react-http', + 'php-icewind-streams', 'php-masterminds-html5', 'php-league-mime-type-detection', 'php-monolog2', ]; $rpms = []; foreach (glob("$from/$pat") as $file) { -- cgit