From d636972dd9b3e5c7cfbe84eb798e9a4431b818e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Sat, 5 Apr 2014 00:47:09 +0200 Subject: [PATCH] qubes-release: variable dom0 base distribution cont. (#807) Update Fedora repos files. --- ...ra-updates.repo => fedora-updates.repo.in} | 24 +++++++++---------- qubes-release/{fedora.repo => fedora.repo.in} | 24 +++++++++---------- qubes-release/qubes-release.spec | 5 ++-- 3 files changed, 26 insertions(+), 27 deletions(-) rename qubes-release/{fedora-updates.repo => fedora-updates.repo.in} (55%) rename qubes-release/{fedora.repo => fedora.repo.in} (58%) diff --git a/qubes-release/fedora-updates.repo b/qubes-release/fedora-updates.repo.in similarity index 55% rename from qubes-release/fedora-updates.repo rename to qubes-release/fedora-updates.repo.in index b5b81c5..f3c2f8c 100644 --- a/qubes-release/fedora-updates.repo +++ b/qubes-release/fedora-updates.repo.in @@ -1,29 +1,29 @@ [updates] -name=Fedora 18 - x86_64 - Updates +name=Fedora %FCREL% - x86_64 - Updates failovermethod=priority -#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/18/x86_64/ -mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f18&arch=x86_64 +#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/%FCREL%/x86_64/ +mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f%FCREL%&arch=x86_64 enabled=1 enablegroups=0 gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-18-primary +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-%FCREL%-primary [updates-debuginfo] -name=Fedora 18 - x86_64 - Updates - Debug +name=Fedora %FCREL% - x86_64 - Updates - Debug failovermethod=priority -#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/18/x86_64/debug/ -mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-debug-f18&arch=x86_64 +#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/%FCREL%/x86_64/debug/ +mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-debug-f%FCREL%&arch=x86_64 enabled=0 enablegroups=0 gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-18-primary +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-%FCREL%-primary [updates-source] -name=Fedora 18 - Updates Source +name=Fedora %FCREL% - Updates Source failovermethod=priority -#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/18/SRPMS/ -mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-source-f18&arch=x86_64 +#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/%FCREL%/SRPMS/ +mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-source-f%FCREL%&arch=x86_64 enabled=0 enablegroups=0 gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-18-primary +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-%FCREL%-primary diff --git a/qubes-release/fedora.repo b/qubes-release/fedora.repo.in similarity index 58% rename from qubes-release/fedora.repo rename to qubes-release/fedora.repo.in index baf2275..1161028 100644 --- a/qubes-release/fedora.repo +++ b/qubes-release/fedora.repo.in @@ -1,32 +1,32 @@ [fedora] -name=Fedora 18 - x86_64 +name=Fedora %FCREL% - x86_64 failovermethod=priority -#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/18/Everything/x86_64/os/ -mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-18&arch=x86_64 +#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/%FCREL%/Everything/x86_64/os/ +mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-%FCREL%&arch=x86_64 enabled=1 enablegroups=0 metadata_expire=7d gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-18-primary +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-%FCREL%-primary [fedora-debuginfo] -name=Fedora 18 - x86_64 - Debug +name=Fedora %FCREL% - x86_64 - Debug failovermethod=priority -#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/18/Everything/x86_64/debug/ -mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-18&arch=x86_64 +#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/%FCREL%/Everything/x86_64/debug/ +mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-%FCREL%&arch=x86_64 enabled=0 enablegroups=0 metadata_expire=7d gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-18-primary +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-%FCREL%-primary [fedora-source] -name=Fedora 18 - Source +name=Fedora %FCREL% - Source failovermethod=priority -#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/18/Everything/source/SRPMS/ -mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-source-18&arch=x86_64 +#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/%FCREL%/Everything/source/SRPMS/ +mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-source-%FCREL%&arch=x86_64 enabled=0 enablegroups=0 metadata_expire=7d gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-18-primary +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-%FCREL%-primary diff --git a/qubes-release/qubes-release.spec b/qubes-release/qubes-release.spec index 2e7fd43..bef8871 100644 --- a/qubes-release/qubes-release.spec +++ b/qubes-release/qubes-release.spec @@ -72,10 +72,9 @@ install -d -m 755 $RPM_BUILD_ROOT/etc/pki/rpm-gpg install -m 644 RPM-GPG-KEY* $RPM_BUILD_ROOT/etc/pki/rpm-gpg/ install -d -m 755 $RPM_BUILD_ROOT/etc/yum.repos.d -for file in {fedora,fedora-updates}*repo ; do - install -m 644 $file $RPM_BUILD_ROOT/etc/yum.repos.d -done sed -e "s/%%DIST%%/fc%{fedora_base_version}/" qubes-dom0.repo.in > $RPM_BUILD_ROOT/etc/yum.repos.d/qubes-dom0.repo +sed -e "s/%%FCREL%%/%{fedora_base_version}/" fedora.repo.in > $RPM_BUILD_ROOT/etc/yum.repos.d/fedora.repo +sed -e "s/%%FCREL%%/%{fedora_base_version}/" fedora-updates.repo.in > $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-updates.repo install -d -m 755 $RPM_BUILD_ROOT/usr/share/qubes %if 0%{?qubes_builder}