[lorax/f16] - Do not remove nss certificates (#730438) - Remove dogtail from the image, as it's blocking tree co

[Martin Gracik]

commit a88c61ce9138888df8193a32dc0d2068c703306f
Author: Martin Gracik <mgracik at redhat.com>
Date:   Mon Aug 15 09:27:37 2011 +0200

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

 .gitignore       |    1 +
 libreport.patch  |   16 ----------------
 lorax.spec       |   20 ++++++--------------
 no-dogtail.patch |   22 ----------------------
 sources          |    2 +-
 5 files changed, 8 insertions(+), 53 deletions(-)
---
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/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 at redhat.com> 16.4-3
-- Add libreport required packages (mgracik).
-  Resolves: rhbz#729537
-
-* Fri Jul 29 2011 Chris Lumens <clumens at 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 at 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 at redhat.com> 16.4-1
 - Add nss libraries to the image.
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