QubesOS/qubes-installer-qubes-os
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qubes-release: provide Qubes-comps.xml

Browse Source
This commit is contained in:
Marek Marczykowski 2013-02-08 23:01:34 +01:00
parent b34dea8418
commit 10dc163e42
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -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 rpm/SOURCES/qubes-logos-$(QBSLOGOS_VERSION).tar.bz2: qubes-logos qubes-logos/qubes-logos.spec
$(call package,qubes-logos,$(QBSLOGOS_VERSION)) $(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)) $(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 rpms_anaconda: rpm/SOURCES/anaconda-$(ANACONDA_VERSION).tar.bz2
rpmbuild $(RPMBUILD_DEFINES) -bb anaconda/anaconda.spec rpmbuild $(RPMBUILD_DEFINES) -bb anaconda/anaconda.spec

5
qubes-release/qubes-release.spec
View File

@ -9,6 +9,7 @@ Release: 2
License: GPLv2 License: GPLv2
Group: System Environment/Base Group: System Environment/Base
Source: %{name}-%{version}.tar.bz2 Source: %{name}-%{version}.tar.bz2
Source1: Qubes-comps.xml
Obsoletes: fedora-release Obsoletes: fedora-release
Obsoletes: redhat-release Obsoletes: redhat-release
Provides: fedora-release = %{fedora_base_version}-%{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 install -m 644 $file $RPM_BUILD_ROOT/etc/yum.repos.d
done 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 # Set up the dist tag macros
install -d -m 755 $RPM_BUILD_ROOT/etc/rpm install -d -m 755 $RPM_BUILD_ROOT/etc/rpm
cat >> $RPM_BUILD_ROOT/etc/rpm/macros.dist << EOF 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 %config %attr(0644,root,root) /etc/rpm/macros.dist
%dir /etc/pki/rpm-gpg %dir /etc/pki/rpm-gpg
/etc/pki/rpm-gpg/* /etc/pki/rpm-gpg/*
/usr/share/qubes/Qubes-comps.xml
%files notes %files notes
%defattr(-,root,root,-) %defattr(-,root,root,-)

1
rpm/SOURCES/.gitignore vendored
View File

@ -3,3 +3,4 @@
*.patch *.patch
*.diff *.diff
*.spec *.spec
*.xml