From 10dc163e42f1f785354fd56cce6972d2515a3b35 Mon Sep 17 00:00:00 2001
From: Marek Marczykowski <marmarek@invisiblethingslab.com>
Date: Fri, 8 Feb 2013 23:01:34 +0100
Subject: [PATCH] qubes-release: provide Qubes-comps.xml

---
 Makefile                         | 3 ++-
 qubes-release/qubes-release.spec | 5 +++++
 rpm/SOURCES/.gitignore           | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 63bdf7e..91cd945 100644
--- a/Makefile
+++ b/Makefile
@@ -85,8 +85,9 @@ rpm/SOURCES/firstboot-$(FIRSTBOOT_VERSION).tar.bz2: firstboot firstboot/firstboo
 rpm/SOURCES/qubes-logos-$(QBSLOGOS_VERSION).tar.bz2: qubes-logos qubes-logos/qubes-logos.spec
 	$(call package,qubes-logos,$(QBSLOGOS_VERSION))
 
-rpm/SOURCES/qubes-release-$(QBSRELEASE_VERSION).tar.bz2: qubes-release qubes-release/qubes-release.spec
+rpm/SOURCES/qubes-release-$(QBSRELEASE_VERSION).tar.bz2: qubes-release qubes-release/qubes-release.spec conf/comps-qubes.xml
 	$(call package,qubes-release,$(QBSRELEASE_VERSION))
+	cp conf/comps-qubes.xml rpm/SOURCES/Qubes-comps.xml
 
 rpms_anaconda: rpm/SOURCES/anaconda-$(ANACONDA_VERSION).tar.bz2
 	rpmbuild $(RPMBUILD_DEFINES) -bb anaconda/anaconda.spec
diff --git a/qubes-release/qubes-release.spec b/qubes-release/qubes-release.spec
index 3e8777b..52f7d49 100644
--- a/qubes-release/qubes-release.spec
+++ b/qubes-release/qubes-release.spec
@@ -9,6 +9,7 @@ Release:	2
 License:	GPLv2
 Group:		System Environment/Base
 Source:		%{name}-%{version}.tar.bz2
+Source1:	Qubes-comps.xml
 Obsoletes:	fedora-release
 Obsoletes:	redhat-release
 Provides:	fedora-release = %{fedora_base_version}-%{release}
@@ -59,6 +60,9 @@ for file in {qubes,fedora,fedora-updates}*repo ; do
   install -m 644 $file $RPM_BUILD_ROOT/etc/yum.repos.d
 done
 
+install -d -m 755 $RPM_BUILD_ROOT/usr/share/qubes
+install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/usr/share/qubes/Qubes-comps.xml
+
 # Set up the dist tag macros
 install -d -m 755 $RPM_BUILD_ROOT/etc/rpm
 cat >> $RPM_BUILD_ROOT/etc/rpm/macros.dist << EOF
@@ -96,6 +100,7 @@ rm -rf $RPM_BUILD_ROOT
 %config %attr(0644,root,root) /etc/rpm/macros.dist
 %dir /etc/pki/rpm-gpg
 /etc/pki/rpm-gpg/*
+/usr/share/qubes/Qubes-comps.xml
 
 %files notes
 %defattr(-,root,root,-)
diff --git a/rpm/SOURCES/.gitignore b/rpm/SOURCES/.gitignore
index d6cdb4f..a706536 100644
--- a/rpm/SOURCES/.gitignore
+++ b/rpm/SOURCES/.gitignore
@@ -3,3 +3,4 @@
 *.patch
 *.diff
 *.spec
+*.xml