From 570ed9064e687d625e942344a6627d0c62f70e79 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 10 Feb 2022 13:54:16 +0100
Subject: F36 helpers

---
 mkmodular | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 57 insertions(+), 3 deletions(-)

(limited to 'mkmodular')

diff --git a/mkmodular b/mkmodular
index 77c5e13..7da9171 100755
--- a/mkmodular
+++ b/mkmodular
@@ -335,23 +335,30 @@ chdir($dest);
 
 // Key
 [$dis,$ver]=explode("/", $dest);
-$GPG_NAME="Remi's RPM repository";
 if ($dis == "fedora") {
-	if ($ver >= 34) {
+	if ($ver >= 36) {
+		$GPG_PATH="/home/remi/.gnupgrpm";
+		$GPG_NAME="845160D23149DAD504F0A32D83C0639E1FEF0014";
+	} else if ($ver >= 34) {
 		$GPG_PATH="/home/remi/.gnupg2021";
+		$GPG_NAME="B1ABF71E14C9D74897E198A8B19527F1478F8947";
 	} else if ($ver >= 32) {
 		$GPG_PATH="/home/remi/.gnupg2020";
+		$GPG_NAME="34C10BDBCC6F1B252E50BA1A0714919E4C21A808";
 	} else {
 		$GPG_PATH="/home/remi/.gnupg2019";
+		$GPG_NAME="5F136145BF10369B7685D8DE503666CCBBAE6F1B";
 	}
 } else {
 	if ($ver >= 9) {
 		$GPG_PATH="/home/remi/.gnupg2021";
+		$GPG_NAME="B1ABF71E14C9D74897E198A8B19527F1478F8947";
 	} else if ($ver == 8) {
 		$GPG_PATH="/home/remi/.gnupg2018";
+		$GPG_NAME="6B38FEA7231F87F52B9CA9D8555097595F11735A";
 	} else {
 		$GPG_PATH="/home/remi/.gnupgrpm";
-		$GPG_NAME="Remi Collet";
+		$GPG_NAME="1EE04CCE88A4AE4AA29A5DF5004E6F4700F97F56";
 	}
 }
 echo "Metadata, signing with $GPG_PATH, ";
@@ -494,6 +501,53 @@ if (in_array('f35', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
 	$mod .= genModule('fedora/35/debug-test81/x86_64', $dest, '*.rpm',         '8.1', 'x86_64', $deps, $template_php);
 	createRepo($dest, $mod);
 }
+if (count($_SERVER['argv']) < 2 || in_array('f36', $_SERVER['argv'])) {
+	$dest = 'fedora/36/modular/x86_64';
+	echo "Populate $dest\n";
+	cleanup($dest);
+	$mod  = '';
+
+	$deps = ['platform' => 'f36'];
+	$mod .= genModule('fedora/36/php74/x86_64',  $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/36/php80/x86_64',  $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/36/php81/x86_64',  $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php);
+	$mod .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1']);
+	createRepo($dest, $mod);
+
+	$dest = 'fedora/36/debug-modular/x86_64';
+	echo "Populate $dest\n";
+	cleanup($dest);
+	$mod  = '';
+
+	$deps = ['platform' => 'f36'];
+	$mod .= genModule('fedora/36/debug-php74/x86_64',  $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/36/debug-remi/x86_64',   $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/36/debug-php81/x86_64',  $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php);
+	createRepo($dest, $mod);
+}
+if (in_array('f36', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
+	$dest = 'fedora/36/modular-test/x86_64';
+	echo "Populate $dest\n";
+	cleanup($dest);
+	$mod  = '';
+
+	$deps = ['platform' => 'f36'];
+	$mod .= genModule('fedora/36/test74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/36/test/x86_64',   $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/36/test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php);
+	createRepo($dest, $mod);
+
+	$dest = 'fedora/36/debug-modular-test/x86_64';
+	echo "Populate $dest\n";
+	cleanup($dest);
+	$mod  = '';
+
+	$deps = ['platform' => 'f36'];
+	$mod .= genModule('fedora/36/debug-test74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/36/debug-test/x86_64',   $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/36/debug-test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php);
+	createRepo($dest, $mod);
+}
 
 if (in_array('el8', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
 	$dest = 'enterprise/8/modular-test/x86_64';
-- 
cgit