From eb3ff56275237c509b18a228e8a677144ee3eff8 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 31 Jan 2022 17:26:18 +0100
Subject: add redis:remi-7.0 new stream

---
 mkmodular | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'mkmodular')

diff --git a/mkmodular b/mkmodular
index b2563c5..77c5e13 100755
--- a/mkmodular
+++ b/mkmodular
@@ -247,6 +247,7 @@ function findPackages($from, $dest, $pat) {
 		'php-amqplib', 'php-jsonlint', 'php-cs-fixer', 'php-tecnickcom-tc-lib-unicode-data',
 		'php-doctrine-orm',
 		'php-laminas-authentication', 'php-laminas-diactoros2', 'php-laminas-mime', 'php-laminas-i18n-resources',
+		'php-laminas-memory', 'php-laminas-test', 'php-laminas-view',
 		'php-icewind-streams', 'php-masterminds-html5', 'php-league-mime-type-detection',
 	];
 	$rpms = [];
@@ -542,7 +543,8 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv'])) {
 	$mod .= genModule('enterprise/8/redis50/x86_64', $dest, 'redis*.rpm', '5.0', 'x86_64', $deps, $template_redis);
 	$mod .= genModule('enterprise/8/redis60/x86_64', $dest, 'redis*.rpm', '6.0', 'x86_64', $deps, $template_redis);
 	$mod .= genModule('enterprise/8/redis62/x86_64', $dest, 'redis*.rpm', '6.2', 'x86_64', $deps, $template_redis);
-	$mod .= genDefaults('redis', '5', ['remi-5.0', 'remi-6.0', 'remi-6.2']);
+	$mod .= genModule('enterprise/8/redis70/x86_64', $dest, 'redis*.rpm', '7.0', 'x86_64', $deps, $template_redis);
+	$mod .= genDefaults('redis', '5', ['remi-5.0', 'remi-6.0', 'remi-6.2', 'remi-7.0']);
 
 	$deps = ['platform' => 'el8', 'php' => ''];
 	$mod .= genModule('enterprise/8/composer1/x86_64', $dest, '*.rpm',         '1', 'x86_64', $deps, $template_comp);
@@ -566,6 +568,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv'])) {
 	$mod .= genModule('enterprise/8/debug-redis50/x86_64', $dest, 'redis*.rpm', '5.0', 'x86_64', $deps, $template_redis);
 	$mod .= genModule('enterprise/8/debug-redis60/x86_64', $dest, 'redis*.rpm', '6.0', 'x86_64', $deps, $template_redis);
 	$mod .= genModule('enterprise/8/debug-redis62/x86_64', $dest, 'redis*.rpm', '6.2', 'x86_64', $deps, $template_redis);
+	$mod .= genModule('enterprise/8/debug-redis70/x86_64', $dest, 'redis*.rpm', '7.0', 'x86_64', $deps, $template_redis);
 	createRepo($dest, $mod);
 }
 
@@ -610,13 +613,14 @@ if (count($_SERVER['argv']) < 2 || in_array('el9', $_SERVER['argv'])) {
 	$mod .= genModule('enterprise/9/redis50/x86_64', $dest, 'redis*.rpm', '5.0', 'x86_64', $deps, $template_redis);
 	$mod .= genModule('enterprise/9/redis60/x86_64', $dest, 'redis*.rpm', '6.0', 'x86_64', $deps, $template_redis);
 	$mod .= genModule('enterprise/9/redis62/x86_64', $dest, 'redis*.rpm', '6.2', 'x86_64', $deps, $template_redis);
-	$mod .= genDefaults('redis', false, ['remi-5.0', 'remi-6.0', 'remi-6.2']);
+	$mod .= genModule('enterprise/9/redis70/x86_64', $dest, 'redis*.rpm', '7.0', 'x86_64', $deps, $template_redis);
+	$mod .= genDefaults('redis', false, ['remi-5.0', 'remi-6.0', 'remi-6.2', 'remi-7.0']);
 
 	$mod .= genModule('enterprise/9/memcached/x86_64', $dest, 'mem*.rpm', false, 'x86_64', $deps, $template_memcached);
 	$mod .= genDefaults('memcached', false, ['remi']);
 
 	$mod .= genModule('enterprise/9/composer2/x86_64', $dest, '*.rpm',         '2', 'x86_64', $deps, $template_comp);
-	$mod .= genDefaults('composer', '2', ['2']);
+	$mod .= genDefaults('composer', false, ['2']);
 	createRepo($dest, $mod);
 
 	$dest = 'enterprise/9/debug-modular/x86_64';
@@ -632,6 +636,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el9', $_SERVER['argv'])) {
 	$mod .= genModule('enterprise/9/debug-redis50/x86_64', $dest, 'redis*.rpm', '5.0', 'x86_64', $deps, $template_redis);
 	$mod .= genModule('enterprise/9/debug-redis60/x86_64', $dest, 'redis*.rpm', '6.0', 'x86_64', $deps, $template_redis);
 	$mod .= genModule('enterprise/9/debug-redis62/x86_64', $dest, 'redis*.rpm', '6.2', 'x86_64', $deps, $template_redis);
+	$mod .= genModule('enterprise/9/debug-redis70/x86_64', $dest, 'redis*.rpm', '7.0', 'x86_64', $deps, $template_redis);
 
 	$mod .= genModule('enterprise/9/debug-memcached/x86_64', $dest, 'mem*.rpm', false, 'x86_64', $deps, $template_memcached);
 	createRepo($dest, $mod);
-- 
cgit