Add transitional package for dom0 dist upgrade

Makefile.builder

@@ -5,5 +5,6 @@ RPM_SPEC_FILES := anaconda/anaconda.spec \
                   qubes-release/qubes-release.spec \
                   lorax-templates-qubes/lorax-templates-qubes.spec \
                   pungi/pungi.spec \
-                  pykickstart/pykickstart.spec
+                  pykickstart/pykickstart.spec \
+                  qubes-release/qubes-dom0-dist-upgrade.spec
 endif

qubes-release/qubes-dom0-dist-upgrade.spec

@@ -0,0 +1,56 @@
+%define fedora_base_version %{fedora}
+
+%if 0%{?qubes_builder}
+%define _builddir %(pwd)/qubes-release
+%endif
+
+Summary:	Qubes dom0 dist upgrade
+Name:		qubes-dom0-dist-upgrade
+Version:	2.0
+Release:	1
+License:	GPLv2
+Group:		System Environment/Base
+Source:		%{name}-%{version}.tar.bz2
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:	noarch
+
+%description
+Qubes dom0 upgrade transitional package.
+
+%prep
+%if ! 0%{?qubes_builder}
+%setup -q
+%endif
+
+%build
+
+%install
+rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT/etc
+
+install -d -m 755 $RPM_BUILD_ROOT/etc/pki/rpm-gpg
+
+install -m 644 RPM-GPG-KEY-fedora-%{fedora_base_version}-primary $RPM_BUILD_ROOT/etc/pki/rpm-gpg/
+
+install -d -m 755 $RPM_BUILD_ROOT/etc/yum.repos.d
+sed -e "s/%%DIST%%/fc%{fedora_base_version}/" qubes-dom0.repo.in > $RPM_BUILD_ROOT/etc/yum.repos.d/qubes-dom0-upgrade.repo
+sed -e "s/%%FCREL%%/%{fedora_base_version}/" fedora.repo.in > $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-upgrade.repo
+sed -e "s/%%FCREL%%/%{fedora_base_version}/" fedora-updates.repo.in > $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-updates-upgrade.repo
+
+sed -i -e "s/^\[/[upgrade-/;s/^name=.*/\0 (upgrade)/" $RPM_BUILD_ROOT/etc/yum.repos.d/*repo
+
+%post
+# Import all keys b/c rpm won't do it automatically (as opposite to yum)
+rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-* || true
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root,-)
+%config(noreplace) /etc/yum.repos.d/fedora-upgrade.repo
+%config(noreplace) /etc/yum.repos.d/fedora-updates-upgrade.repo
+%config(noreplace) /etc/yum.repos.d/qubes-dom0-upgrade.repo
+/etc/pki/rpm-gpg/*
+
+%changelog

qubes-release/qubes-release.spec

@@ -19,6 +19,7 @@ Obsoletes:	redhat-release
 Provides:	fedora-release = %{fedora_base_version}-%{release}
 Provides:	redhat-release = %{fedora_base_version}-%{release}
 Provides:	system-release = %{version}-%{release}
+Obsoletes:	qubes-dom0-dist-upgrade <= 2.0
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch