From 95a6fe011ca81dd5c3c96bcb57707936a3a26978 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Thu, 23 Dec 2021 17:12:53 -0500
Subject: [PATCH] packaging: repo files for rpm should contains correct repo
GitLab: #1371
Change-Id: Iaa825b8b0bc090d88c645f2953c897e07a6bc710
---
client-gnome | 2 +-
client-qt | 2 +-
daemon | 2 +-
lrc | 2 +-
scripts/deploy-packages.sh | 4 ++--
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/client-gnome b/client-gnome
index 6dcd20b4..d493e44f 160000
--- a/client-gnome
+++ b/client-gnome
@@ -1 +1 @@
-Subproject commit 6dcd20b4489d303e8fcae996a4d83ab7c2e5d875
+Subproject commit d493e44ff3fd106456df85d0e73f6b3c08ecd38c
diff --git a/client-qt b/client-qt
index 1ab4edb6..83f68573 160000
--- a/client-qt
+++ b/client-qt
@@ -1 +1 @@
-Subproject commit 1ab4edb6cc510ce15d7965823ecc5b879d946a96
+Subproject commit 83f68573324a453a6d26e025fd6439f175a79d1b
diff --git a/daemon b/daemon
index e8dbf2af..02c5cecd 160000
--- a/daemon
+++ b/daemon
@@ -1 +1 @@
-Subproject commit e8dbf2af93be10869bbc2688ccd09ef3f927f430
+Subproject commit 02c5cecd363a1ee25a914d72e243d7903e44969b
diff --git a/lrc b/lrc
index 26ad683c..48db64cb 160000
--- a/lrc
+++ b/lrc
@@ -1 +1 @@
-Subproject commit 26ad683c133d1604a082c7743a6d7d3b2d20fdff
+Subproject commit 48db64cbcd3a8d7a12cad940694ce9239b8db576
diff --git a/scripts/deploy-packages.sh b/scripts/deploy-packages.sh
index f90f0973..596e11c6 100755
--- a/scripts/deploy-packages.sh
+++ b/scripts/deploy-packages.sh
@@ -152,9 +152,9 @@ function package_rpm()
# .repo file
name="Jami \$releasever - \$basearch - jami"
- baseurl="https://dl.jami.net/nightly/${DISTRIBUTION%_*}_\$releasever"
+ baseurl="https://dl.jami.net/${CHANNEL}/${DISTRIBUTION%_*}_\$releasever"
- cat << EOF > ${DISTRIBUTION_REPOSITORY_FOLDER}/jami-nightly.repo
+ cat << EOF > ${DISTRIBUTION_REPOSITORY_FOLDER}/jami-${CHANNEL}.repo
[jami]
name=$name
baseurl=$baseurl
--
GitLab