From c88e50ee5e68d74a213d53e66beed9529473d303 Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating at redhat dot com>
Date: Thu, 30 Aug 2007 16:56:08 -0400
Subject: [PATCH] Fix creation of source isos. Add source repo to kickstart
 file End %packages section with %end per new pykickstart api

---
 Changelog          | 5 +++++
 pungi              | 6 ++++--
 pungi.spec         | 9 +++++++--
 setup.py           | 2 +-
 share/f8-fedora.ks | 2 ++
 5 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/Changelog b/Changelog
index 4a989bbc..5cae9759 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,8 @@
+* Thu Aug 30 2007 Jesse Keating <jkeating@redhat.com>
+- Fix some bugs with source iso creation
+- Add source repo to kickstart file
+- Add %end to %packages in kickstart file
+
 * Tue Aug 28 2007 Jesse Keating <jkeating@redhat.com>
 - Default flavor to blank.
 
diff --git a/pungi b/pungi
index 43cb3706..f263dc0c 100755
--- a/pungi
+++ b/pungi
@@ -71,6 +71,8 @@ def main():
     config.set('default', 'cachedir', opts.cachedir)
     config.set('default', 'bugurl', opts.bugurl)
     config.set('default', 'discs', opts.discs)
+    if opts.sourceisos:
+        config.set('default', 'arch', 'source')
 
     # set some other defaults
     config.set('default', 'iso_basename', config.get('default', 'name'))
@@ -130,7 +132,7 @@ def main():
            mypungi.doCreateIsos()
 
     # Do things slightly different for src.
-    if config.get('default', 'arch') == 'source':
+    if opts.sourceisos:
         # we already have all the content gathered
         mypungi = pypungi.pungi.Pungi(config)
         mypungi.topdir = os.path.join(config.get('default', 'destdir'),
@@ -153,7 +155,7 @@ if __name__ == '__main__':
     today = time.strftime('%Y%m%d', time.localtime())
 
     def get_arguments():
-        parser = OptionParser(version="%prog 1.0.1")
+        parser = OptionParser(version="%prog 1.0.2")
 
         # Pulled in from config file to be cli options as part of pykickstart conversion
         parser.add_option("--name", default="Fedora", dest="name",
diff --git a/pungi.spec b/pungi.spec
index 5eca8eeb..f1ddaf78 100644
--- a/pungi.spec
+++ b/pungi.spec
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           pungi
-Version:        1.0.1
-Release:        1%{?dist}.1
+Version:        1.0.2
+Release:        1%{?dist}
 Summary:        Distribution compose tool
 
 Group:          Development/Tools
@@ -48,6 +48,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 30 2007 Jesse Keating <jkeating@redhat.com> - 1.0.2-1
+- Fix some bugs with source iso creation
+- Add source repo to kickstart file
+- Add %end to %packages in kickstart file
+
 * Tue Aug 28 2007 Jesse Keating <jkeating@redhat.com> - 1.0.1-1
 - Default flavor to blank.
 
diff --git a/setup.py b/setup.py
index 1b6ae9ab..966f5c58 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from distutils.core import setup
 import glob
 
 setup(name='pungi',
-      version='1.0.1',
+      version='1.0.2',
       description='Distribution compose tool',
       author='Jesse Keating',
       author_email='jkeating@redhat.com',
diff --git a/share/f8-fedora.ks b/share/f8-fedora.ks
index b251cced..09cd846b 100644
--- a/share/f8-fedora.ks
+++ b/share/f8-fedora.ks
@@ -6,6 +6,7 @@
 
 # Add the repos you wish to use to compose here.  At least one of them needs group data.
 repo --name=rawhide  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
+repo --name=rawhide-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch
 
 # Package manifest for the compose.  Uses repo group metadata to translate groups.
 # (@base is added by default unless you add --nobase to %packages)
@@ -133,3 +134,4 @@ jfsutils
 anaconda-runtime
 iscsi-initiator-utils
 memtest86+
+%end