[lorax/f18] - remove multipath rules (#880263) (bcl at redhat.com) - add installupgradeinitrd function and use it t

[Brian C. Lane]

commit ce54a0f0cab8eb9f21466d181e7e892c65c4ef72
Author: Brian C. Lane <bcl at redhat.com>
Date:   Wed Dec 5 17:18:08 2012 -0800

    - remove multipath rules (#880263) (bcl at redhat.com)
    - add installupgradeinitrd function and use it to install the upgrade initrds
      (dennis at ausil.us)
    - use installinitrd to install the upgrade.img initramfs so that we get correct
      permissions (dennis at ausil.us)
    - ppc and arm need to use kernel.upgrade not kernel.upgrader (dennis at ausil.us)
    - remove upgrade from the sparc and sysylinux config templates
      (dennis at ausil.us)
    - Add the 'fedup' plymouth theme if available (wwoods at redhat.com)
    - make templates install upgrade.img (wwoods at redhat.com)
    - build fedup upgrade.img (wwoods at redhat.com)
    - treebuilder: improve findkernels() initrd search (wwoods at redhat.com)
    - treebuilder: add 'prefix' to rebuild_initrds() (wwoods at redhat.com)
    - Add thai-scalable-waree-fonts (#872468) (mgracik at redhat.com)
    - Do not remove the fipscheck package (#882153) (mgracik at redhat.com)
    - Add MokManager.efi to EFI/BOOT (#882101) (mgracik at redhat.com)

 .gitignore                                         |    1 +
 ...treebuilder-add-prefix-to-rebuild_initrds.patch |   55 ----------
 ...builder-improve-findkernels-initrd-search.patch |   60 -----------
 0003-build-fedup-upgrade.img.patch                 |   53 ----------
 0004-make-templates-install-upgrade.img.patch      |  107 -------------------
 ...Add-the-fedup-plymouth-theme-if-available.patch |   40 -------
 ...ade-from-the-sparc-and-sysylinux-config-t.patch |   57 ----------
 ...-need-to-use-kernel.upgrade-not-kernel.up.patch |   55 ----------
 ...initrd-to-install-the-upgrade.img-initram.patch |   84 ---------------
 ...upgradeinitrd-function-and-use-it-to-inst.patch |  110 --------------------
 lorax.spec                                         |   58 ++++-------
 sources                                            |    2 +-
 12 files changed, 21 insertions(+), 661 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index df7a893..fed9775 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,4 @@
 /lorax-18.20.tar.gz
 /lorax-18.21.tar.gz
 /lorax-18.22.tar.gz
+/lorax-18.23.tar.gz
diff --git a/lorax.spec b/lorax.spec
index 5d217a8..1191863 100644
--- a/lorax.spec
+++ b/lorax.spec
@@ -1,8 +1,8 @@
 %define debug_package %{nil}
 
 Name:           lorax
-Version:        18.22
-Release:        7%{?dist}
+Version:        18.23
+Release:        1%{?dist}
 Summary:        Tool for creating the anaconda install images
 
 Group:          Applications/System
@@ -53,16 +53,6 @@ Requires:       kernel-bootwrapper
 Requires:       openssh
 %endif
 
-Patch0: 0001-treebuilder-add-prefix-to-rebuild_initrds.patch      
-Patch1: 0002-treebuilder-improve-findkernels-initrd-search.patch
-Patch2: 0003-build-fedup-upgrade.img.patch             
-Patch3: 0004-make-templates-install-upgrade.img.patch
-Patch4: 0005-Add-the-fedup-plymouth-theme-if-available.patch
-Patch5: 0006-remove-upgrade-from-the-sparc-and-sysylinux-config-t.patch
-Patch6: 0007-ppc-and-arm-need-to-use-kernel.upgrade-not-kernel.up.patch
-Patch7: 0008-use-installinitrd-to-install-the-upgrade.img-initram.patch
-Patch8: 0009-add-installupgradeinitrd-function-and-use-it-to-inst.patch
-
 %description
 Lorax is a tool for creating the anaconda install images.
 
@@ -72,15 +62,6 @@ Anaconda's image install feature.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
 
 %build
 
@@ -103,24 +84,23 @@ make DESTDIR=$RPM_BUILD_ROOT install
 
 
 %changelog
-* Fri Nov 30 2012 Dennis Gilmore <dennis at ausil.us> - 18.22-7
-- fix calls to installupgradeinitrd
-
-* Tue Nov 27 2012 Dennis Gilmore <dennis at ausil.us> 18.22-6
-- switch to using installupgradeinitrd method for upgrade initrds
-
-* Fri Nov 23 2012 Dennis Gilmore <dennis at ausil.us> 18.22-5
-- add patch fixing composing on ppc and arm
-- add patch to fix permissions of upgrade.img
-
-* Tue Nov 20 2012 Dennis Gilmore <dennis at ausil.us> 18.22-4
-- add updated 0006 patch, media upgrades are unsupported remove all refereneces to upgrade
-
-* Tue Nov 20 2012 Adam Williamson <awilliam at redhat.com> 18.22-3
-- drop 0006-add-options patch, that's not how media upgrades will work
-
-* Tue Nov 20 2012 Dennis Gilmore <dennis at ausil.us> 18.22-2
-- add patches for fedup support
+* Wed Dec 05 2012 Brian C. Lane <bcl at redhat.com> 18.23-1
+- remove multipath rules (#880263) (bcl at redhat.com)
+- add installupgradeinitrd function and use it to install the upgrade initrds
+  (dennis at ausil.us)
+- use installinitrd to install the upgrade.img initramfs so that we get correct
+  permissions (dennis at ausil.us)
+- ppc and arm need to use kernel.upgrade not kernel.upgrader (dennis at ausil.us)
+- remove upgrade from the sparc and sysylinux config templates
+  (dennis at ausil.us)
+- Add the 'fedup' plymouth theme if available (wwoods at redhat.com)
+- make templates install upgrade.img (wwoods at redhat.com)
+- build fedup upgrade.img (wwoods at redhat.com)
+- treebuilder: improve findkernels() initrd search (wwoods at redhat.com)
+- treebuilder: add 'prefix' to rebuild_initrds() (wwoods at redhat.com)
+- Add thai-scalable-waree-fonts (#872468) (mgracik at redhat.com)
+- Do not remove the fipscheck package (#882153) (mgracik at redhat.com)
+- Add MokManager.efi to EFI/BOOT (#882101) (mgracik at redhat.com)
 
 * Tue Nov 06 2012 Brian C. Lane <bcl at redhat.com> 18.22-1
 - Install the yum-langpacks plugin (#868869) (jkeating at redhat.com)
diff --git a/sources b/sources
index 5fad61b..0d5603c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-64a2d5daa760dcc95233a4b1e1f45fc4  lorax-18.22.tar.gz
+3222f46d6af3536e76e055e220536ede  lorax-18.23.tar.gz