Merge branch 'master' of git://git.qubes-os.org/marmarek/template-builder

Makefile

@@ -6,6 +6,8 @@ TEMPLATE_NAME := $${DIST/fc/fedora-}-x64
 VERSION := $(shell cat version)
 TIMESTAMP := $(shell date -u +%Y%m%d%H%M)
 
+PKGLISTFILE := $(shell [ -r clean_images/packages_$(DIST).list ] && echo clean_images/packages_$(DIST).list || echo clean_images/packages.list)
+
 help:
 	@echo "make rpms                  -- generate template rpm"
 	@echo "make update-repo-installer -- copy newly generated rpm to installer repo"
@@ -16,7 +18,7 @@ rpms:
 	@echo $(TIMESTAMP) > build_timestamp
 	@echo "Building template: $(TEMPLATE_NAME)"
 	@createrepo -q -g $$PWD/comps-qubes-template.xml yum_repo_qubes/$(DIST) -o yum_repo_qubes/$(DIST) && \
-	sudo -E ./fedorize_image fedorized_images/$(TEMPLATE_NAME).img clean_images/packages.list && \
+	sudo -E ./fedorize_image fedorized_images/$(TEMPLATE_NAME).img $(PKGLISTFILE) && \
 	sudo -E ./qubeize_image fedorized_images/$(TEMPLATE_NAME).img $(TEMPLATE_NAME) && \
 	./build_template_rpm $(TEMPLATE_NAME) || exit 1; \
 

clean_images/packages_fc18.list

@@ -0,0 +1,22 @@
+@^gnome-desktop-environment
+@libreoffice
+emacs
+vim-enhanced
+gnupg
+xterm
+firefox
+thunderbird
+keepassx
+perl-File-MimeInfo
+Terminal
+--exclude=kdegames
+--exclude=firstboot
+--exclude=xorg-x11-drv-nouveau
+--exclude=firewall-config,firewalld
+--exclude=gnome-boxes
+git
+createrepo
+rpm-build
+qubes-core-vm-kernel-placeholder
+ltrace
+strace

templates.spec

@@ -16,10 +16,11 @@ URL:		http://www.qubes-os.org
 Source:		.
 
 Requires:	qubes-core-dom0 >= 1.4.1
-Requires:   kernel-qubes-vm
+Requires:	kernel-qubes-vm
 Requires:	xdg-utils
 Requires(post):	tar
 Requires(post):	qubes-core-dom0
+Provides:	qubes-template
 
 %define _builddir %(pwd)
 %define _rpmdir %(pwd)/rpm