[pungi] Add support for --installpkgs (bcl)

Dennis Gilmore ausil at fedoraproject.org
Sat Dec 13 02:26:28 UTC 2014


commit 05c4c5e8ee965a7ff8f8affd35fc922cb8455875
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Fri Dec 12 20:29:17 2014 -0600

    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(-)
---
diff --git a/.gitignore b/.gitignore
index 30eca12..ea0d456 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/pungi.spec b/pungi.spec
index ec4016b..d9f4be2 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 at 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 at ausil.us> - 3.12-2
 - add patch to fix whitespace errors
 
diff --git a/sources b/sources
index 38195d1..f8de28a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-864c411bc1294d88cb2b38f299f1974f  pungi-3.12.tar.bz2
+4609de9057defe74f33c803a2da166a1  pungi-3.13.tar.bz2


More information about the scm-commits mailing list