From ae78aea67368c4b77166089e1f951d8bc9dc633e Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Aug 29 2007 03:42:25 +0000 Subject: Default the flavor to blank. --- diff --git a/Changelog b/Changelog index 37b392b..4a989bb 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,6 @@ +* Tue Aug 28 2007 Jesse Keating +- Default flavor to blank. + * Mon Aug 27 2007 Jesse Keating - Set up arch in __init__.py as it's needed for logging - Add support for $releasever in repo uris. diff --git a/pungi b/pungi index 546384c..43cb370 100755 --- a/pungi +++ b/pungi @@ -153,14 +153,14 @@ if __name__ == '__main__': today = time.strftime('%Y%m%d', time.localtime()) def get_arguments(): - parser = OptionParser(version="%prog 1.0.0") + parser = OptionParser(version="%prog 1.0.1") # Pulled in from config file to be cli options as part of pykickstart conversion parser.add_option("--name", default="Fedora", dest="name", help='the name for your distribution (defaults to "Fedora")') parser.add_option("--ver", default=today, dest="ver", help='the version of your distribution (defaults to datestamp)') - parser.add_option("--flavor", dest="flavor", + parser.add_option("--flavor", default="", dest="flavor", help='the flavor of your distribution spin (optional)') parser.add_option("--destdir", default=".", dest="destdir", help='destination directory (defaults to current directory)') diff --git a/pungi.spec b/pungi.spec index c9c445c..5eca8ee 100644 --- a/pungi.spec +++ b/pungi.spec @@ -1,12 +1,12 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: pungi -Version: 1.0.0 -Release: 1%{?dist} +Version: 1.0.1 +Release: 1%{?dist}.1 Summary: Distribution compose tool Group: Development/Tools -License: GPL +License: GPLv2 URL: http://hosted.fedoraproject.org/projects/pungi Source0: http://linux.duke.edu/projects/%{name}/release/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -48,7 +48,13 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Mon Aug 27 2007 Jesse Keating +* Tue Aug 28 2007 Jesse Keating - 1.0.1-1 +- Default flavor to blank. + +* Mon Aug 27 2007 Jesse Keating - 1.0.0-2 +- Fix the licensing tag. + +* Mon Aug 27 2007 Jesse Keating - 1.0.0-1 - Add support for $releasever in repo uris. - Add a kickstart file usable for composing Fedora 8 "Fedora" - Fix bugs with $basearch and mirrorlist usage. diff --git a/setup.py b/setup.py index 2747e67..1b6ae9a 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from distutils.core import setup import glob setup(name='pungi', - version='1.0.0', + version='1.0.1', description='Distribution compose tool', author='Jesse Keating', author_email='jkeating@redhat.com',