From 4c3d39283bd004ded24e1c02b21283432d7c3f50 Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Thu, 15 Nov 2012 17:52:03 +0100 Subject: [PATCH] qubes-release: use $releasever in repository url --- qubes-release/{qubes-r1-dom0.repo => qubes-dom0.repo} | 6 +++--- qubes-release/qubes-release.spec | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) rename qubes-release/{qubes-r1-dom0.repo => qubes-dom0.repo} (73%) diff --git a/qubes-release/qubes-r1-dom0.repo b/qubes-release/qubes-dom0.repo similarity index 73% rename from qubes-release/qubes-r1-dom0.repo rename to qubes-release/qubes-dom0.repo index 2ac2709..10f608f 100644 --- a/qubes-release/qubes-r1-dom0.repo +++ b/qubes-release/qubes-dom0.repo @@ -1,6 +1,6 @@ [qubes-dom0-current] name = Qubes Dom0 Repository (updates) -baseurl = http://yum.qubes-os.org/r1/current/dom0 +baseurl = http://yum.qubes-os.org/r$releasever/current/dom0 enabled = 1 metadata_expire = 7d gpgcheck = 1 @@ -8,7 +8,7 @@ gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary [qubes-dom0-current-testing] name = Qubes Dom0 Repository (updates-testing) -baseurl = http://yum.qubes-os.org/r1/current-testing/dom0 +baseurl = http://yum.qubes-os.org/r$releasever/current-testing/dom0 enabled = 0 metadata_expire = 7d gpgcheck = 1 @@ -16,7 +16,7 @@ gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary [qubes-dom0-unstable] name = Qubes Dom0 Repository (unstable) -baseurl = http://yum.qubes-os.org/r1/unstable/dom0 +baseurl = http://yum.qubes-os.org/r$releasever/unstable/dom0 enabled = 0 metadata_expire = 7d gpgcheck = 1 diff --git a/qubes-release/qubes-release.spec b/qubes-release/qubes-release.spec index 977aa39..0c570eb 100644 --- a/qubes-release/qubes-release.spec +++ b/qubes-release/qubes-release.spec @@ -94,7 +94,7 @@ 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-r1-dom0.repo +%config(noreplace) /etc/yum.repos.d/qubes-dom0.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