From 5cb6cc8ebc2a58444dc72c6d76d582a5958ba9e0 Mon Sep 17 00:00:00 2001
From: fepitre <frederic.epitre@orange.fr>
Date: Tue, 7 Aug 2018 15:35:25 +0200
Subject: [PATCH] Handle CentOS vm repo

---
 Makefile                                 | 3 ++-
 misc/{qubes-r4.repo => qubes-r4.repo.in} | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)
 rename misc/{qubes-r4.repo => qubes-r4.repo.in} (71%)

diff --git a/Makefile b/Makefile
index 366c51d..9947043 100644
--- a/Makefile
+++ b/Makefile
@@ -161,7 +161,8 @@ install-sysvinit: install-init
 	install network/qubes-iptables $(DESTDIR)/etc/init.d/
 
 install-rh: install-systemd install-systemd-dropins install-sysvinit
-	install -D -m 0644 misc/qubes-r4.repo $(DESTDIR)/etc/yum.repos.d/qubes-r4.repo
+	install -D -m 0644 misc/qubes-r4.repo.in $(DESTDIR)/etc/yum.repos.d/qubes-r4.repo
+	DIST='$(DIST)'; sed -i "s/@DIST@/$$(echo $${DIST%%[0-9]*})/g" $(DESTDIR)/etc/yum.repos.d/qubes-r4.repo
 	install -d $(DESTDIR)$(LIBDIR)/yum-plugins/
 	install -m 0644 misc/yum-qubes-hooks.py* $(DESTDIR)$(LIBDIR)/yum-plugins/
 	install -D -m 0644 misc/yum-qubes-hooks.conf $(DESTDIR)/etc/yum/pluginconf.d/yum-qubes-hooks.conf
diff --git a/misc/qubes-r4.repo b/misc/qubes-r4.repo.in
similarity index 71%
rename from misc/qubes-r4.repo
rename to misc/qubes-r4.repo.in
index 20f9606..c396484 100644
--- a/misc/qubes-r4.repo
+++ b/misc/qubes-r4.repo.in
@@ -1,6 +1,6 @@
 [qubes-vm-r4.0-current]
 name = Qubes OS Repository for VM (updates)
-baseurl = https://yum.qubes-os.org/r4.0/current/vm/fc$releasever
+baseurl = https://yum.qubes-os.org/r4.0/current/vm/@DIST@$releasever
 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-4-primary
 skip_if_unavailable=False
 gpgcheck = 1
@@ -8,7 +8,7 @@ enabled=1
 
 [qubes-vm-r4.0-current-testing]
 name = Qubes OS Repository for VM (updates-testing)
-baseurl = https://yum.qubes-os.org/r4.0/current-testing/vm/fc$releasever
+baseurl = https://yum.qubes-os.org/r4.0/current-testing/vm/@DIST@$releasever
 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-4-primary
 skip_if_unavailable=False
 gpgcheck = 1
@@ -16,7 +16,7 @@ enabled=0
 
 [qubes-vm-r4.0-security-testing]
 name = Qubes OS Repository for VM (security-testing)
-baseurl = https://yum.qubes-os.org/r4.0/security-testing/vm/fc$releasever
+baseurl = https://yum.qubes-os.org/r4.0/security-testing/vm/@DIST@$releasever
 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-4-primary
 skip_if_unavailable=False
 gpgcheck = 1
@@ -24,7 +24,7 @@ enabled=0
 
 [qubes-vm-r4.0-unstable]
 name = Qubes OS Repository for VM (unstable)
-baseurl = https://yum.qubes-os.org/r4.0/unstable/vm/fc$releasever
+baseurl = https://yum.qubes-os.org/r4.0/unstable/vm/@DIST@$releasever
 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-4-unstable
 gpgcheck = 1
 enabled=0