From 81016f40a86f0fb1a74d8346f159d5ac58d3ffd7 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: May 18 2013 16:33:05 +0000
Subject: Merge branch 'master' into f19


---

diff --git a/.gitignore b/.gitignore
index 719578f..687052d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ appliance-tools-004.5.tar.bz2
 /appliance-tools-006.1.tar.bz2
 /appliance-tools-006.2.tar.bz2
 /appliance-tools-006.3.tar.bz2
+/appliance-tools-006.4.tar.bz2
diff --git a/appliance-tools.spec b/appliance-tools.spec
index 76d924c..ccfd6f2 100644
--- a/appliance-tools.spec
+++ b/appliance-tools.spec
@@ -4,8 +4,8 @@
 
 Summary: Tools for building Appliances
 Name: appliance-tools
-Version: 006.3
-Release: 2%{?dist}
+Version: 006.4
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://thincrust.org/
@@ -16,7 +16,6 @@ URL: http://thincrust.org/
 #  git checkout appliance-tools-006.2
 #  make dist
 Source0: appliance-tools-%{version}.tar.bz2
-Patch0:  0001-couple-of-typo-fixes-in-extlinux-support-from-mattdm.patch
 Requires: livecd-tools >= 020 curl rsync kpartx
 Requires: zlib
 Requires: qemu-img
@@ -41,7 +40,6 @@ Tool that helps remove unwanted files from the appliance image.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 make
@@ -74,6 +72,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/image-minimizer
 
 %changelog
+* Sat May 18 2013 Dennis Gilmore <dennis@ausil.us> - 006.4-1
+- write out kickstart file
+- correctly write out extlinux config
+- dont require --ondisk for partitions
+
 * Sun May 12 2013 Dennis Gilmore <dennis@ausil.us> - 006.3-2
 - add patch for typo fixes in extlinux config from mattdm
 
diff --git a/sources b/sources
index ac21c79..cd3fee1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-81f99a35dad5494d86cb115e0df9e662  appliance-tools-006.3.tar.bz2
+afa8ee0843de0a65a088216d9d804cf2  appliance-tools-006.4.tar.bz2