From 0d32a533e7ff112e64b63d492715d3a6d837ada1 Mon Sep 17 00:00:00 2001
From: Marek Marczykowski <marmarek@invisiblethingslab.com>
Date: Mon, 12 Dec 2011 03:34:20 +0100
Subject: [PATCH] vm/yum-repo: Use $releasever in repo definition

Instead of multiple files with only release version different.
---
 common/qubes.fc14.repo                 | 20 --------------------
 common/qubes.fc15.repo                 | 20 --------------------
 common/{qubes.fc13.repo => qubes.repo} |  6 +++---
 rpm_spec/core-commonvm.spec            |  4 ++--
 4 files changed, 5 insertions(+), 45 deletions(-)
 delete mode 100644 common/qubes.fc14.repo
 delete mode 100644 common/qubes.fc15.repo
 rename common/{qubes.fc13.repo => qubes.repo} (77%)

diff --git a/common/qubes.fc14.repo b/common/qubes.fc14.repo
deleted file mode 100644
index 2020d1e5..00000000
--- a/common/qubes.fc14.repo
+++ /dev/null
@@ -1,20 +0,0 @@
-[qubes-vm-current]
-name = Qubes OS Repository for VM (updates)
-baseurl = http://yum.qubes-os.org/r1-beta2/current/vm/fc14
-gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary
-gpgcheck = 1
-
-[qubes-vm-current-testing]
-name = Qubes OS Repository for VM (updates-testing)
-baseurl = http://yum.qubes-os.org/r1-beta2/current-testing/vm/fc14
-gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary
-gpgcheck = 1
-enabled=0
-
-[qubes-vm-unstable]
-name = Qubes OS Repository for VM (unstable)
-baseurl = http://yum.qubes-os.org/r1-beta2/unstable/vm/fc14
-gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary
-gpgcheck = 1
-enabled=0
-
diff --git a/common/qubes.fc15.repo b/common/qubes.fc15.repo
deleted file mode 100644
index 15a90b65..00000000
--- a/common/qubes.fc15.repo
+++ /dev/null
@@ -1,20 +0,0 @@
-[qubes-vm-current]
-name = Qubes OS Repository for VM (updates)
-baseurl = http://yum.qubes-os.org/r1-beta2/current/vm/fc15
-gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary
-gpgcheck = 1
-
-[qubes-vm-current-testing]
-name = Qubes OS Repository for VM (updates-testing)
-baseurl = http://yum.qubes-os.org/r1-beta2/current-testing/vm/fc15
-gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary
-gpgcheck = 1
-enabled=0
-
-[qubes-vm-unstable]
-name = Qubes OS Repository for VM (unstable)
-baseurl = http://yum.qubes-os.org/r1-beta2/unstable/vm/fc15
-gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary
-gpgcheck = 1
-enabled=0
-
diff --git a/common/qubes.fc13.repo b/common/qubes.repo
similarity index 77%
rename from common/qubes.fc13.repo
rename to common/qubes.repo
index 376b4908..6f1a9392 100644
--- a/common/qubes.fc13.repo
+++ b/common/qubes.repo
@@ -1,19 +1,19 @@
 [qubes-vm-current]
 name = Qubes OS Repository for VM (updates)
-baseurl = http://yum.qubes-os.org/r1-beta2/current/vm/fc13
+baseurl = http://yum.qubes-os.org/r1-beta2/current/vm/fc$releasever
 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary
 gpgcheck = 1
 
 [qubes-vm-current-testing]
 name = Qubes OS Repository for VM (updates-testing)
-baseurl = http://yum.qubes-os.org/r1-beta2/current-testing/vm/fc13
+baseurl = http://yum.qubes-os.org/r1-beta2/current-testing/vm/fc$releasever
 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary
 gpgcheck = 1
 enabled=0
 
 [qubes-vm-unstable]
 name = Qubes OS Repository for VM (unstable)
-baseurl = http://yum.qubes-os.org/r1-beta2/unstable/vm/fc13
+baseurl = http://yum.qubes-os.org/r1-beta2/unstable/vm/fc$releasever
 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary
 gpgcheck = 1
 enabled=0
diff --git a/rpm_spec/core-commonvm.spec b/rpm_spec/core-commonvm.spec
index 4194b230..35f5ffcb 100644
--- a/rpm_spec/core-commonvm.spec
+++ b/rpm_spec/core-commonvm.spec
@@ -66,7 +66,7 @@ mkdir -p $RPM_BUILD_ROOT/var/lib/qubes
 mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
 cp iptables $RPM_BUILD_ROOT/etc/sysconfig/
 mkdir -p $RPM_BUILD_ROOT/etc/yum.repos.d
-cp qubes%{dist}.repo $RPM_BUILD_ROOT/etc/yum.repos.d
+cp qubes.repo $RPM_BUILD_ROOT/etc/yum.repos.d
 install -d -m 755 $RPM_BUILD_ROOT/etc/pki/rpm-gpg
 install -m 644 RPM-GPG-KEY-qubes* $RPM_BUILD_ROOT/etc/pki/rpm-gpg/
 mkdir -p $RPM_BUILD_ROOT/sbin
@@ -243,7 +243,7 @@ rm -rf $RPM_BUILD_ROOT
 /etc/init.d/qubes_core
 /etc/sysconfig/iptables
 /var/lib/qubes
-/etc/yum.repos.d/qubes%{dist}.repo
+/etc/yum.repos.d/qubes.repo
 /etc/pki/rpm-gpg/RPM-GPG-KEY-qubes*
 /sbin/qubes_serial_login
 /usr/bin/xenstore-watch-qubes