From 0346c1cf4b872b068c56754a31c3cfc66aa81ccf Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 30 Sep 2014 22:13:06 -0500 Subject: [PATCH] add patch to fix whitespace errors --- 0001-replace-tabs-with-spaces.patch | 29 +++++++++++++++++++++++++++++ pungi.spec | 8 ++++++-- 2 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 0001-replace-tabs-with-spaces.patch diff --git a/0001-replace-tabs-with-spaces.patch b/0001-replace-tabs-with-spaces.patch new file mode 100644 index 00000000..0b5b4eb7 --- /dev/null +++ b/0001-replace-tabs-with-spaces.patch @@ -0,0 +1,29 @@ +From add538d7b42f50a08c66c0114dd3f021f0235fd8 Mon Sep 17 00:00:00 2001 +From: Dennis Gilmore +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 6db1b5d1..ec4016b7 100644 --- a/pungi.spec +++ b/pungi.spec @@ -2,14 +2,14 @@ Name: pungi Version: 3.12 -Release: 1%{?dist} +Release: 2%{?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 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: 0001-replace-tabs-with-spaces.patch Requires: yum => 3.4.3-28, repoview, createrepo >= 0.4.11 Requires: lorax, python-lockfile BuildRequires: python-devel @@ -22,6 +22,7 @@ A tool to create anaconda based installation trees/isos of a set of rpms. %prep %setup -q +%patch0 -p1 %build %{__python} setup.py build @@ -55,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Sep 30 2014 Dennis Gilmore - 3.12-2 +- add patch to fix whitespace errors + * Thu Sep 11 2014 Dennis Gilmore - 3.12-1 - Remove magic parameter to mkisofs (hamzy) - Added option for setting release note files (riehecky)