[lorax/f17] - Add nhn-nanum-fonts Resolves: rhbz#818127 - add name field to .treeinfo its a concatination of f

[Martin Gracik]

commit 0e49143caf789cd130068ff48293fcce28439eff
Author: Martin Gracik <mgracik at redhat.com>
Date:   Wed May 9 14:55:32 2012 +0200

    - Add nhn-nanum-fonts
      Resolves: rhbz#818127
    - add name field to .treeinfo its a concatination of family and version (dgilmore)
    - include the new cmsfs-fuse interface (dhorak)
    - Fix typo in help
      Resolves: rhbz#819476

 .gitignore |    1 +
 lorax.spec |   18 +++++++++++++++++-
 sources    |    2 +-
 3 files changed, 19 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 43deefc..67e36ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@
 /lorax-17.16.tar.bz2
 /lorax-17.17.tar.bz2
 /lorax-17.18.tar.bz2
+/lorax-17.19.tar.bz2
diff --git a/lorax.spec b/lorax.spec
index 8691bce..1f12284 100644
--- a/lorax.spec
+++ b/lorax.spec
@@ -1,7 +1,7 @@
 %define debug_package %{nil}
 
 Name:           lorax
-Version:        17.18
+Version:        17.19
 Release:        1%{?dist}
 Summary:        Tool for creating the anaconda install images
 
@@ -9,6 +9,7 @@ Group:          Applications/System
 License:        GPLv2+
 URL:            http://git.fedorahosted.org/git/?p=lorax.git
 Source0:        https://fedorahosted.org/releases/l/o/%{name}/%{name}-%{version}.tar.bz2
+Patch0:         lorax-disable-macboot-img.patch
 
 BuildRequires:  python2-devel
 Requires:       python-mako
@@ -57,6 +58,10 @@ Anaconda's image install feature.
 
 %prep
 %setup -q
+# disable macboot.img on RHEL
+%if 0%{?rhel}
+%patch0 -p1
+%endif
 
 %build
 
@@ -79,6 +84,17 @@ make DESTDIR=$RPM_BUILD_ROOT install
 
 
 %changelog
+* Wed May 09 2012 Martin Gracik <mgracik at redhat.com> 17.19-1
+- Add nhn-nanum-fonts
+  Resolves: rhbz#818127
+- add name field to .treeinfo its a concatination of family and version (dgilmore)
+- include the new cmsfs-fuse interface (dhorak)
+- Fix typo in help
+  Resolves: rhbz#819476
+
+* Wed May 09 2012 Daniel Mach <dmach at redhat.com> 17.18-2
+- Disable macboot.img on RHEL
+
 * Tue May 08 2012 Brian C. Lane <bcl at redhat.com> 17.18-1
 - stop moving /run (#818918) (bcl)
 
diff --git a/sources b/sources
index 126d911..a0008aa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cfec1b84a0ab1bfcbb6cb3f885b9c2d8  lorax-17.18.tar.bz2
+7fa50e5e5215cb2a3b3fb0f0c2550318  lorax-17.19.tar.bz2