pungi: update to 3.14

pungi/0001-Make-our-OS-iso-bootable-on-aarch64.patch

@@ -1,29 +0,0 @@
-From 33ebc4e11f88390a70e4f4b2c24725e8dc2ce741 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Tue, 9 Dec 2014 11:48:59 -0500
-Subject: [PATCH] Make our OS iso bootable on aarch64.
-
-Aarch64 needs to get the el torito image generation code x86 has for
-UEFI as well.
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
----
- src/pypungi/__init__.py | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/pypungi/__init__.py b/src/pypungi/__init__.py
-index 2211513..6a1d474 100644
---- a/src/pypungi/__init__.py
-+++ b/src/pypungi/__init__.py
-@@ -1625,6 +1625,8 @@ class Pungi(pypungi.PungiBase):
-         elif self.tree_arch.startswith('ppc'):
-             extraargs.extend(ppcbootargs)
-             extraargs.append(os.path.join(self.topdir, "ppc/mac"))
-+        elif self.tree_arch.startswith('aarch64'):
-+            extraargs.extend(efibootargs)
- 
-         # NOTE: if this doesn't match what's in the bootloader config, the
-         # image won't be bootable!
--- 
-2.2.0
-

pungi/0001-replace-tabs-with-spaces.patch

@@ -1,29 +0,0 @@
-From add538d7b42f50a08c66c0114dd3f021f0235fd8 Mon Sep 17 00:00:00 2001
-From: Dennis Gilmore <dennis@ausil.us>
-Date: Fri, 19 Sep 2014 15:28:05 -0500
-Subject: [PATCH] replace tabs with spaces
-
----
- src/bin/pungi.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/bin/pungi.py b/src/bin/pungi.py
-index 2d1761e..aa831a6 100755
---- a/src/bin/pungi.py
-+++ b/src/bin/pungi.py
-@@ -273,10 +273,10 @@ if __name__ == '__main__':
-           help="Flag to enable processing the BuildInstall stage")
-         parser.add_option("-I", action="store_true", default=False, dest="do_createiso",
-           help="Flag to enable processing the CreateISO stage")
--	parser.add_option("--relnotepkgs", dest="relnotepkgs", type="string",
-+        parser.add_option("--relnotepkgs", dest="relnotepkgs", type="string",
-           action="callback", callback=set_config, callback_args=(config, ),
-           help='Rpms which contain the release notes')
--	parser.add_option("--relnotefilere", dest="relnotefilere", type="string",
-+        parser.add_option("--relnotefilere", dest="relnotefilere", type="string",
-           action="callback", callback=set_config, callback_args=(config, ),
-           help='Which files are the release notes -- GPL EULA')
- 
--- 
-2.1.0
-

pungi/disable-upgrade.patch

@@ -4,8 +4,8 @@
  
          lorax.run(self.ayum, product=product, version=version, release=release,
                    variant=variant, bugurl=bugurl, isfinal=isfinal, domacboot=domacboot,
--                  workdir=workdir, outputdir=outputdir)
+-                  workdir=workdir, outputdir=outputdir, volid=volid, installpkgs=installpkgs)
-+                  workdir=workdir, outputdir=outputdir, volid=volid, doupgrade=False)
++                  workdir=workdir, outputdir=outputdir, volid=volid, installpkgs=installpkgs, doupgrade=False)
  
          # write out the tree data for snake
          self.writeinfo('tree: %s' % self.mkrelative(self.topdir))

pungi/pungi.spec

@@ -5,7 +5,7 @@
 %endif
 
 Name:           pungi
-Version:        3.12
+Version:        3.14
 Release:        2%{?dist}
 Epoch:          1000
 Summary:        Distribution compose tool
@@ -14,16 +14,18 @@ Group:          Development/Tools
 License:        GPLv2
 URL:            https://fedorahosted.org/pungi
 Source0:        https://fedorahosted.org/pungi/attachment/wiki/%{version}/%{name}-%{version}.tar.bz2
-Patch0:         0001-replace-tabs-with-spaces.patch
-Patch1:         0001-Make-our-OS-iso-bootable-on-aarch64.patch
 Patch2:         support-verify-downloaded-packages.patch
 Patch3:         disable-efi.patch
 Patch4:         effective-nosource-option.patch
 #Patch5:         fix-recursive-partition-table-on-iso-image.patch
 Patch6:         disable-upgrade.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:       yum => 3.4.3-28, repoview, createrepo >= 0.4.11
+Requires:       createrepo >= 0.4.11
-Requires:       lorax
+Requires:       yum => 3.4.3-28
+Requires:       lorax >= 22.1
+Requires:       repoview
+Requires:       python-lockfile
+
 BuildRequires:  python-devel
 
 BuildArch:      noarch
@@ -35,8 +37,6 @@ A tool to create anaconda based installation trees/isos of a set of rpms.
 %prep
 %setup -q
 
-%patch0 -p1
-%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
@@ -75,8 +75,18 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Mon Dec 15 2014 Dennis Gilmore <dennis@ausil.us> - 3.12-3
+* Tue Mar 10 2015 Dennis Gilmore <dennis@ausil.us> - 3.14-1
-- add patch to make the dvd bootable on aarch64
+- switch to BSD style hashes for the iso checksums (dennis)
+- refactor to get better data into .treeinfo (dennis)
+- Add --nomacboot option (csieh)
+
+* Fri Dec 12 2014 Dennis Gilmore <dennis@ausil.us> - 3.13-1
+- Add support for --installpkgs (bcl)
+- Add a cmdline option to set the lorax config file (bcl)
+- Add python-lockfile requires and drop python-devel (bcl)
+- Make our OS iso bootable on aarch64. (pjones)
+- fix up typo (dennis)
+- replace tabs with spaces (dennis)
 
 * Tue Sep 30 2014 Dennis Gilmore <dennis@ausil.us> - 3.12-2
 - add patch to fix whitespace errors