[lorax] - Fix product name replacing in templates Resolves: rhbz#799919

[Martin Gracik]

commit 0153a7c9ee63f10f45a7057d8113cb66645005dd
Author: Martin Gracik <mgracik at redhat.com>
Date:   Wed Mar 7 16:27:35 2012 +0100

    - Fix product name replacing in templates
      Resolves: rhbz#799919

 .gitignore |    1 +
 lorax.spec |   52 +++++++++++++++++++++++++++++++++-------------------
 sources    |    2 +-
 3 files changed, 35 insertions(+), 20 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f2d9a37..5f2f39d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
 /lorax-17.2.tar.bz2
 /lorax-18.0.tar.bz2
 /lorax-18.1.tar.bz2
+/lorax-17.9.tar.bz2
diff --git a/lorax.spec b/lorax.spec
index 6bd58a2..4816243 100644
--- a/lorax.spec
+++ b/lorax.spec
@@ -1,7 +1,7 @@
 %define debug_package %{nil}
 
 Name:           lorax
-Version:        18.1
+Version:        17.9
 Release:        1%{?dist}
 Summary:        Tool for creating the anaconda install images
 
@@ -30,6 +30,7 @@ Requires:       gzip
 Requires:       xz
 Requires:       squashfs-tools >= 4.2
 Requires:       e2fsprogs
+Requires:       yum
 
 %ifarch %{ix86} x86_64
 Requires:       syslinux >= 4.02-5
@@ -40,10 +41,13 @@ Requires:       silo
 %endif
 
 %ifarch ppc ppc64
-Requires:       yaboot
 Requires:       kernel-bootwrapper
 %endif
 
+%ifarch s390 s390x
+Requires:       openssh
+%endif
+
 %description
 Lorax is a tool for creating the anaconda install images.
 
@@ -75,35 +79,45 @@ make DESTDIR=$RPM_BUILD_ROOT install
 
 
 %changelog
-* Tue Mar 06 2012 Brian C. Lane <bcl at redhat.com> 18.1-1
+* Wed Mar 07 2012 Martin Gracik <mgracik at redhat.com> 17.9-1
+- Fix product name replacing in templates
+  Resolves: rhbz#799919
+
+* Tue Mar 06 2012 Brian C. Lane <bcl at redhat.com> 17.8-1
 - livemedia-creator: update README (bcl)
 - example livemedia kickstart for ec2 (bcl)
 - livemedia-creator: console=ttyS0 not /dev/ttyS0 (bcl)
 - livemedia-creator: Add support for making ami images (bcl)
-- Don't remove btrfs utils (#796511) (mgracik)
-- Remove root and ip parameters from generic.prm (#796572) (mgracik)
-- Check if the volume id is not longer than 32 chars (#786832) (mgracik)
-- Add option to specify volume id on command line (#786834) (mgracik)
-- Install nhn-nanum-gothic-fonts (#790266) (mgracik)
-- Change the locale to C (#786833) (mgracik)
-- iputils is small and required by dhclient-script (bcl)
-- util-linux-ng is now util-linux (bcl)
-
-* Mon Feb 20 2012 Brian C. Lane <bcl at redhat.com> 18.0-1
+
+* Tue Feb 28 2012 Martin Gracik <mgracik at redhat.com> 17.7-1
+- Don't remove btrfs utils (#796511)
+- Remove root and ip parameters from generic.prm (#796572)
+- Check if the volume id is not longer than 32 chars (#786832)
+- Add option to specify volume id on command line (#786834)
+- Install nhn-nanum-gothic-fonts (#790266)
+- Change the locale to C (#786833)
+- Don't use mk-s390-cdboot (dhorak)
+- use internal implementation of the addrsize utility
+- Make sure var/run is not a symlink on s390x (#787217)
+- Create var/run/dbus directory on s390x (#787217)
+- iputils is small and required by dhclient-script
+- missing version bump in specfile
+
+* Mon Feb 20 2012 Brian C. Lane <bcl at redhat.com> 17.6-1
 - use --prefix=/run/initramfs when building initramfs (wwoods)
 - dhclient-script needs cut and arping (bcl)
 - Fix missing CalledProcessError import (bcl)
+
+* Wed Feb 15 2012 Brian C. Lane <bcl at redhat.com> 17.5-1
 - metacity now depends on gsettings-desktop-schemas (bcl)
 - Add findiso to grub config (mjg)
-- add memtest to the boot.iso for x86 (#787234) (bcl)
-- Don't use mk-s390-cdboot (dhorak) (mgracik)
-- Add dracut args to grub.conf (bcl)
+
+* Mon Feb 13 2012 Brian C. Lane <bcl at redhat.com> 17.4-1
 - Change the squashfs image section in .treeinfo (mgracik)
 - Add path to squashfs image to the treeinfo (mgracik)
 - Add runtime basename variable to the template (mgracik)
-- use internal implementation of the addrsize utility (dan)
-- Make sure var/run is not a symlink on s390x (#787217) (mgracik)
-- Create var/run/dbus directory on s390x (#787217) (mgracik)
+- add memtest to the boot.iso for x86 (#787234) (bcl)
+- Add dracut args to grub.conf (bcl)
 
 * Wed Feb 08 2012 Brian C. Lane <bcl at redhat.com> 17.3-1
 - keep convertfs.sh script in image (#787893) (bcl)
diff --git a/sources b/sources
index 3089b0b..c26de66 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0ad9ed86907787bbf03a83f576d767d3  lorax-18.1.tar.bz2
+03b69027fd61147f8daca4f751b05cf1  lorax-17.9.tar.bz2