From 05c4c5e8ee965a7ff8f8affd35fc922cb8455875 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Fri, 12 Dec 2014 20:29:17 -0600
Subject: [PATCH] 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)
---
 .gitignore                          |  1 +
 0001-replace-tabs-with-spaces.patch | 29 -----------------------------
 pungi.spec                          | 26 +++++++++++++++++---------
 sources                             |  2 +-
 4 files changed, 19 insertions(+), 39 deletions(-)
 delete mode 100644 0001-replace-tabs-with-spaces.patch

diff --git a/.gitignore b/.gitignore
index 30eca125..ea0d4566 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@ pungi-2.1.2.tar.bz2
 /pungi-3.10.tar.bz2
 /pungi-3.11.tar.bz2
 /pungi-3.12.tar.bz2
+/pungi-3.13.tar.bz2
diff --git a/0001-replace-tabs-with-spaces.patch b/0001-replace-tabs-with-spaces.patch
deleted file mode 100644
index 0b5b4eb7..00000000
--- a/0001-replace-tabs-with-spaces.patch
+++ /dev/null
@@ -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
-
diff --git a/pungi.spec b/pungi.spec
index ec4016b7..d9f4be28 100644
--- a/pungi.spec
+++ b/pungi.spec
@@ -1,17 +1,20 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           pungi
-Version:        3.12
-Release:        2%{?dist}
+Version:        3.13
+Release:        1%{?dist}
 Summary:        Distribution compose tool
 
 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
-Requires:       yum => 3.4.3-28, repoview, createrepo >= 0.4.11
-Requires:       lorax, python-lockfile
+Requires:       createrepo >= 0.4.11
+Requires:       yum => 3.4.3-28
+Requires:       lorax >= 22.1
+Requires:       repoview
+Requires:       python-lockfile
+
 BuildRequires:  python-devel
 
 BuildArch:      noarch
@@ -22,7 +25,6 @@ A tool to create anaconda based installation trees/isos of a set of rpms.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %{__python} setup.py build
@@ -46,9 +48,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc Authors Changelog COPYING GPL ToDo doc/README
 # For noarch packages: sitelib
 %{python_sitelib}/pypungi
-%if 0%{?fedora} >= 9 || 0%{?rhel} >= 6
-  %{python_sitelib}/%{name}-%{version}-py?.?.egg-info
-%endif
+%{python_sitelib}/%{name}-%{version}-py?.?.egg-info
 %{_bindir}/pungi
 %{_datadir}/pungi
 %{_mandir}/man8/pungi.8.gz
@@ -56,6 +56,14 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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
 
diff --git a/sources b/sources
index 38195d13..f8de28ab 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-864c411bc1294d88cb2b38f299f1974f  pungi-3.12.tar.bz2
+4609de9057defe74f33c803a2da166a1  pungi-3.13.tar.bz2