From a88c61ce9138888df8193a32dc0d2068c703306f Mon Sep 17 00:00:00 2001
From: Martin Gracik <mgracik@redhat.com>
Date: Aug 15 2011 07:27:37 +0000
Subject: - Do not remove nss certificates (#730438)

- Remove dogtail from the image, as it's blocking tree composition. (clumens)
- Add libreport required packages (#729537)

---

diff --git a/.gitignore b/.gitignore
index ea6be0b..d3ec8a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 /lorax-16.2.tar.bz2
 /lorax-16.3.tar.bz2
 /lorax-16.4.tar.bz2
+/lorax-16.4.1.tar.bz2
diff --git a/libreport.patch b/libreport.patch
deleted file mode 100644
index 8d14262..0000000
--- a/libreport.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/share/ramdisk.ltmpl b/share/ramdisk.ltmpl
-index b8aa6d0..e50be53 100644
---- a/share/ramdisk.ltmpl
-+++ b/share/ramdisk.ltmpl
-@@ -132,6 +132,11 @@ install "python-imaging"
- install "python-volume_key"
- install "rdate"
- install "reiserfs-utils"
-+install "libreport-gtk"
-+install "libreport-newt"
-+install "libreport-plugin-bugzilla"
-+install "libreport-plugin-reportuploader"
-+install "libreport-python"
- install "rsh"
- install "rsync"
- install "rsyslog"
diff --git a/lorax.spec b/lorax.spec
index a88cd04..7d0cac7 100644
--- a/lorax.spec
+++ b/lorax.spec
@@ -1,8 +1,8 @@
 %define debug_package %{nil}
 
 Name:           lorax
-Version:        16.4
-Release:        3%{?dist}
+Version:        16.4.1
+Release:        1%{?dist}
 Summary:        Tool for creating the anaconda install images
 
 Group:          Applications/System
@@ -10,9 +10,6 @@ License:        GPLv2+
 URL:            http://git.fedorahosted.org/git/?p=lorax.git
 Source0:        https://fedorahosted.org/releases/l/o/%{name}/%{name}-%{version}.tar.bz2
 
-Patch0:         no-dogtail.patch
-Patch1:         libreport.patch
-
 BuildRequires:  python2-devel
 Requires:       python-mako
 Requires:       gawk
@@ -44,8 +41,6 @@ Lorax is a tool for creating the anaconda install images.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 
@@ -66,13 +61,10 @@ make DESTDIR=$RPM_BUILD_ROOT install
 
 
 %changelog
-* Fri Aug 12 2011 Chris Lumens <clumens@redhat.com> 16.4-3
-- Add libreport required packages (mgracik).
-  Resolves: rhbz#729537
-
-* Fri Jul 29 2011 Chris Lumens <clumens@redhat.com> 16.4-2
-- Remove dogtail from the image, as it's blocking tree composition.
-  Related: rhbz#726743
+* Mon Aug 15 2011 Martin Gracik <mgracik@redhat.com> 16.4.1-1
+- Do not remove nss certificates (#730438)
+- Remove dogtail from the image, as it's blocking tree composition. (clumens)
+- Add libreport required packages (#729537)
 
 * Tue Jul 26 2011 Martin Gracik <mgracik@redhat.com> 16.4-1
 - Add nss libraries to the image.
diff --git a/no-dogtail.patch b/no-dogtail.patch
deleted file mode 100644
index 734df5e..0000000
--- a/no-dogtail.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ruN lorax-16.4.orig//share/ramdisk.ltmpl lorax-16.4//share/ramdisk.ltmpl
---- lorax-16.4.orig//share/ramdisk.ltmpl	2011-07-26 08:15:51.000000000 -0400
-+++ lorax-16.4//share/ramdisk.ltmpl	2011-07-29 16:15:16.000000000 -0400
-@@ -64,7 +64,6 @@
- install "dbus-x11"
- install "dejavu-sans-fonts"
- install "dejavu-sans-mono-fonts"
--install "dogtail"
- install "dump"
- install "ethtool"
- install "fedora-gnome-theme"
-@@ -648,10 +647,6 @@
- remove "dmz-cursor-themes" "/usr/share/icons/dmz/*"
- remove "dnsmasq" "/etc/rc.d/*"
- remove "dnsmasq" "/usr/sbin/*"
--remove "dogtail" "/usr/bin/*"
--remove "dogtail" "/usr/share/applications/*"
--remove "dogtail" "/usr/share/dogtail/*"
--remove "dogtail" "/usr/share/icons/*"
- remove "dosfstools" "/sbin/dosfsck"
- remove "dosfstools" "/sbin/fsck.*"
- remove "dump" "/etc/*"
diff --git a/sources b/sources
index 7396b52..cdc8748 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0931734d377845cf82e84c7df80f8d1b  lorax-16.4.tar.bz2
+ee3d25b6567ea2b19795369ac434f9b3  lorax-16.4.1.tar.bz2