From 3b1bd1b41e118b6c1fb3f23c1173899a5a77add9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Fri, 6 Dec 2013 13:21:47 +0100
Subject: [PATCH 1/2] qubes-release: Split R2 yum repository for individual
 beta releases.

---
 ...bes-dom0.repo => qubes-dom0-r2-beta2.repo} | 12 +++++-----
 qubes-release/qubes-dom0-r2-beta3.repo        | 24 +++++++++++++++++++
 qubes-release/qubes-release.spec              |  3 ++-
 3 files changed, 32 insertions(+), 7 deletions(-)
 rename qubes-release/{qubes-dom0.repo => qubes-dom0-r2-beta2.repo} (62%)
 create mode 100644 qubes-release/qubes-dom0-r2-beta3.repo

diff --git a/qubes-release/qubes-dom0.repo b/qubes-release/qubes-dom0-r2-beta2.repo
similarity index 62%
rename from qubes-release/qubes-dom0.repo
rename to qubes-release/qubes-dom0-r2-beta2.repo
index e39802e..12c225e 100644
--- a/qubes-release/qubes-dom0.repo
+++ b/qubes-release/qubes-dom0-r2-beta2.repo
@@ -1,22 +1,22 @@
-[qubes-dom0-current]
+[qubes-dom0-r2b2-current]
 name = Qubes Dom0 Repository (updates)
-baseurl = http://yum.qubes-os.org/r$releasever/current/dom0
+baseurl = http://yum.qubes-os.org/r$releasever-beta2/current/dom0
 enabled = 1
 metadata_expire = 7d
 gpgcheck = 1
 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-$releasever-primary
 
-[qubes-dom0-current-testing]
+[qubes-dom0-r2b2-current-testing]
 name = Qubes Dom0 Repository (updates-testing)
-baseurl = http://yum.qubes-os.org/r$releasever/current-testing/dom0
+baseurl = http://yum.qubes-os.org/r$releasever-beta2/current-testing/dom0
 enabled = 0
 metadata_expire = 7d
 gpgcheck = 1
 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-$releasever-primary
 
-[qubes-dom0-unstable]
+[qubes-dom0-r2b2-unstable]
 name = Qubes Dom0 Repository (unstable)
-baseurl = http://yum.qubes-os.org/r$releasever/unstable/dom0
+baseurl = http://yum.qubes-os.org/r$releasever-beta2/unstable/dom0
 enabled = 0
 metadata_expire = 7d
 gpgcheck = 1
diff --git a/qubes-release/qubes-dom0-r2-beta3.repo b/qubes-release/qubes-dom0-r2-beta3.repo
new file mode 100644
index 0000000..428cc00
--- /dev/null
+++ b/qubes-release/qubes-dom0-r2-beta3.repo
@@ -0,0 +1,24 @@
+[qubes-dom0-r2b3-current]
+name = Qubes Dom0 Repository (updates)
+baseurl = http://yum.qubes-os.org/r$releasever-beta3/current/dom0
+enabled = 1
+metadata_expire = 7d
+gpgcheck = 1
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-$releasever-primary
+
+[qubes-dom0-r2b3-current-testing]
+name = Qubes Dom0 Repository (updates-testing)
+baseurl = http://yum.qubes-os.org/r$releasever-beta3/current-testing/dom0
+enabled = 0
+metadata_expire = 7d
+gpgcheck = 1
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-$releasever-primary
+
+[qubes-dom0-r2b3-unstable]
+name = Qubes Dom0 Repository (unstable)
+baseurl = http://yum.qubes-os.org/r$releasever-beta3/unstable/dom0
+enabled = 0
+metadata_expire = 7d
+gpgcheck = 1
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-$releasever-unstable
+
diff --git a/qubes-release/qubes-release.spec b/qubes-release/qubes-release.spec
index b2eefa0..32bfd6a 100644
--- a/qubes-release/qubes-release.spec
+++ b/qubes-release/qubes-release.spec
@@ -115,7 +115,8 @@ rm -rf $RPM_BUILD_ROOT
 %dir /etc/yum.repos.d
 %config(noreplace) /etc/yum.repos.d/fedora.repo
 %config(noreplace) /etc/yum.repos.d/fedora-updates.repo
-%config(noreplace) /etc/yum.repos.d/qubes-dom0.repo
+%config(noreplace) /etc/yum.repos.d/qubes-dom0-r2-beta2.repo
+%config(noreplace) /etc/yum.repos.d/qubes-dom0-r2-beta3.repo
 %config(noreplace) %attr(0644,root,root) /etc/issue
 %config(noreplace) %attr(0644,root,root) /etc/issue.net
 %config %attr(0644,root,root) /etc/rpm/macros.dist

From e3ffb8241e6a4e9868ec9ae6539e2ef320de491b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Fri, 6 Dec 2013 13:24:56 +0100
Subject: [PATCH 2/2] qubes-release-2-4

---
 qubes-release/qubes-release.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qubes-release/qubes-release.spec b/qubes-release/qubes-release.spec
index 32bfd6a..219fe53 100644
--- a/qubes-release/qubes-release.spec
+++ b/qubes-release/qubes-release.spec
@@ -9,7 +9,7 @@
 Summary:	Qubes release files
 Name:		qubes-release
 Version:	%{dist_version}
-Release:	3
+Release:	4
 License:	GPLv2
 Group:		System Environment/Base
 Source:		%{name}-%{version}.tar.bz2