1.0.0 release. Woohoo!

Remove dead config files.  No longer use an /etc directory.

MANIFEST.in

@@ -2,10 +2,8 @@ include Authors
 include Changelog
 include COPYING
 include GPL
-include PLAN.*
 include README
 include TESTING
 include ToDo
 include pungi.spec
-include config/*
 include share/*

config/README

@@ -1,21 +0,0 @@
-This is the configuration directory for pungi.  It holds a host of files that
-will be explained here. (See also 
-http://hosted.fedoraproject.org/projects/pungi/wiki/PungiDocs/ConfigDocs)
-
-pungi.conf; Top level config file for a minimal spin.  Good starting point.
-f8-fedora.i386; Top level config file used for Fedora 8 "Fedora" i386 spin.
-f8-fedora.x86_64; Top level config file used for Fedora 8 "Fedora" x86_64 spin.
-f8-fedora.ppc; Top level config file used for Fedora 8 "Fedora" ppc spin.
-f8-everything.i386; Top level config file used for Fedora 8 "Everything" i386 spin.
-f8-everything.x86_64; Top level config file used for Fedora 8 "Everything" x86_64 spin.
-f8-everything.ppc; Top level config file used for Fedora 8 "Everything" ppc spin.
-f8-fedora.manifest; A package manifest file used for the Fedora 8 "Fedora" spin.
-everything.manifest; A package manifest file used for the Fedora "Everything" spin.
-minimal.manifest; A package manifest with a good attempt at a minimal package set.
-comps-f8.xml; A grouping file used for various spins.
-yum.conf.f8.i386; A yum conf file for Fedora 8 i386.
-yum.conf.f8.x86_64; A yum conf file for Fedora 8 x86_64.
-yum.conf.f8.ppc; A yum conf file for Fedora 8 ppc.
-yum.conf.rawhide.i386; A yum conf file used for rawhide i386.
-yum.conf.rawhide.x86_64; A yum conf file used for rawhide x86_64.
-yum.conf.rawhide.ppc; A yum conf file used for rawhide ppc.

config/everything.manifest

@@ -1,2 +0,0 @@
-# You want everything, you get everything
-*

config/f8-everything.i386

@@ -1,19 +0,0 @@
-# Pungi config file
-#
-
-[default]
-product_name = Fedora
-product_path = Fedora
-iso_basename = F
-bugurl = http://bugzilla.redhat.com
-comps = /etc/pungi/comps-f8.xml
-manifest = /etc/pungi/everything.manifest
-yumconf = /etc/pungi/yum.conf.rawhide.i386
-destdir = /srv/pungi/f8
-cachedir = /srv/pungi/cache
-arch = i386
-version = 7.90
-flavor = Everything
-discs = 2
-cdsize = 4608.0
-getsource = no

config/f8-everything.ppc

@@ -1,19 +0,0 @@
-# Pungi config file
-#
-
-[default]
-product_name = Fedora
-product_path = Fedora
-iso_basename = F
-bugurl = http://bugzilla.redhat.com
-comps = /etc/pungi/comps-f8.xml
-manifest = /etc/pungi/everything.manifest
-yumconf = /etc/pungi/yum.conf.rawhide.ppc
-destdir = /srv/pungi/f8
-cachedir = /srv/pungi/cache
-arch = ppc
-version = 7.90
-flavor = Everything
-discs = 2
-cdsize = 4608.0
-getsource = no

config/f8-everything.x86_64

@@ -1,19 +0,0 @@
-# Pungi config file
-#
-
-[default]
-product_name = Fedora
-product_path = Fedora
-iso_basename = F
-bugurl = http://bugzilla.redhat.com
-comps = /etc/pungi/comps-f8.xml
-manifest = /etc/pungi/everything.manifest
-yumconf = /etc/pungi/yum.conf.rawhide.x86_64
-destdir = /srv/pungi/f8
-cachedir = /srv/pungi/cache
-arch = x86_64
-version = 7.90
-flavor = Everything
-discs = 2
-cdsize = 4608.0
-getsource = no

config/f8-fedora.i386

@@ -1,19 +0,0 @@
-# Pungi config file
-#
-
-[default]
-product_name = Fedora
-product_path = Fedora
-iso_basename = F
-bugurl = http://bugzilla.redhat.com
-comps = /etc/pungi/comps-f8.xml
-manifest = /etc/pungi/f8-fedora.manifest
-yumconf = /etc/pungi/yum.conf.rawhide.i386
-destdir = /srv/pungi/f8
-cachedir = /srv/pungi/cache
-arch = i386
-version = 7.90
-flavor = Fedora
-discs = 1
-# cdsize = 4608.0
-getsource = no

config/f8-fedora.manifest

@@ -1,124 +0,0 @@
-# Base and core
-@base
-@core
-@base-x
-kernel*
-# Hardware stuff
-@hardware-support
-@dial-up
-# Desktop Packages
-@gnome-desktop
-@kde-desktop
-echo-icon-theme
-tracker
-gnash
-liferea
-# apps
-@authoring-and-publishing
-@editors
-emacs
-@games
-@graphical-internet
-@graphics
-@office
-@sound-and-video
-@text-internet
-@system-tools
-wireshark-gnome
-# Devel packages
-@development-libs
-@development-tools
-@gnome-software-development
-@kde-software-development
-@web-development
-@x-software-development
-# Server packages
-@dns-server
-@ftp-server
-@mail-server
-@mysql
-@network-server
-@news-server
-@printing
-@server-cfg
-@smb-server
-@sql-server
-@web-server --optional
-# Virt group
-@virtualization
-# filesystem stuff
-reiserfs-utils
-xfsprogs
-jfsutils
-# Languages
-@afrikaans-support
-@arabic-support
-@assamese-support
-@basque-support
-@bengali-support
-@brazilian-support
-@breton-support
-@british-support
-@bulgarian-support
-@catalan-support
-@chinese-support
-@croatian-support
-@czech-support
-@danish-support
-@dutch-support
-@estonian-support
-@faeroese-support
-@finnish-support
-@french-support
-@gaelic-support
-@galician-support
-@german-support
-@greek-support
-@gujarati-support
-@hebrew-support
-@hindi-support
-@hungarian-support
-@icelandic-support
-@indonesian-support
-@irish-support
-@italian-support
-@japanese-support
-@kannada-support
-@korean-support
-@lithuanian-support
-@malay-support
-@malayalam-support
-@marathi-support
-@northern-sotho-support
-@norwegian-support
-@oriya-support
-@polish-support
-@portuguese-support
-@punjabi-support
-@romanian-support
-@russian-support
-@serbian-support
-@sinhala-support
-@slovak-support
-@slovenian-support
-@southern-ndebele-support
-@southern-sotho-support
-@spanish-support
-@swati-support
-@swedish-support
-@tamil-support
-@telugu-support
-@thai-support
-@tsonga-support
-@tswana-support
-@turkish-support
-@ukrainian-support
-@urdu-support
-@venda-support
-@welsh-support
-@xhosa-support
-@zulu-support
-# Compose Needs
-anaconda-runtime
-iscsi-initiator-utils
-memtest86+

config/f8-fedora.ppc

@@ -1,19 +0,0 @@
-# Pungi config file
-#
-
-[default]
-product_name = Fedora
-product_path = Fedora
-iso_basename = F
-bugurl = http://bugzilla.redhat.com
-comps = /etc/pungi/comps-f8.xml
-manifest = /etc/pungi/f8-fedora.manifest
-yumconf = /etc/pungi/yum.conf.rawhide.ppc
-destdir = /srv/pungi/f8
-cachedir = /srv/pungi/cache
-arch = ppc
-version = 7.90
-flavor = Fedora
-discs = 1
-# cdsize = 4608.0
-getsource = no

config/f8-fedora.source

@@ -1,19 +0,0 @@
-# Pungi config file
-#
-
-[default]
-product_name = Fedora
-product_path = Fedora
-iso_basename = F
-bugurl = http://bugzilla.redhat.com
-comps = /etc/pungi/comps-f8.xml
-manifest = /etc/pungi/f8-fedora.manifest
-yumconf = /etc/pungi/yum.conf.rawhide.i386
-destdir = /srv/pungi/f8
-cachedir = /srv/pungi/cache
-arch = source
-version = 7.90
-flavor = Fedora
-discs = 1
-# cdsize = 4608.0
-getsource = no

config/f8-fedora.x86_64

@@ -1,19 +0,0 @@
-# Pungi config file
-#
-
-[default]
-product_name = Fedora
-product_path = Fedora
-iso_basename = F
-bugurl = http://bugzilla.redhat.com
-comps = /etc/pungi/comps-f8.xml
-manifest = /etc/pungi/f8-fedora.manifest
-yumconf = /etc/pungi/yum.conf.rawhide.x86_64
-destdir = /srv/pungi/f8
-cachedir = /srv/pungi/cache
-arch = x86_64
-version = 7.90
-flavor = Fedora
-discs = 1
-#cdsize = 4608.0
-getsource = no

config/minimal.manifest

@@ -1,12 +0,0 @@
-kernel
-xorg-x11-fonts-ISO8859-1-75dpi
-busybox-anaconda
-dejavu-lgc-fonts
-xorg-x11-fonts-base
-memtest86+
-xorg-x11-drivers
-selinux-policy-targeted
-anaconda-runtime
-man
-joe
-grub

config/pungi.conf

@@ -1,21 +0,0 @@
-# Pungi config file
-#
-# # or ; can be used at the start of a line, ; only to comment inline.
-
-[default]
-product_name = Fedora ; The name used during install
-product_path = Fedora ; The directory where RPMS go
-iso_basename = F ; The first part of the iso file name
-bugurl = http://bugzilla.redhat.com ; Used for betanag
-comps = /etc/pungi/comps-f8.xml ; Used to define package groupings and default installs
-manifest = /etc/pungi/minimal.manifest ; Used to determine what to bring in.  Supports Kickstart syntax
-yumconf = /etc/pungi/yum.conf.f8.x86_64 ; Used to determine where to gather packages from
-destdir = /srv/pungi/Fedora ; Top level compose directory, must be clean
-cachedir = /srv/pungi/cache ; Cache used for repeat runs
-arch = x86_64 ; What arch to compose (must be same arch as system)
-version = 8 ; Used both in install and part of the dest tree
-flavor = Custom ; Further define a given cut of the package set
-discs = 1 ; Number of discs needed to fit data.
-#cdsize = 4608.0 ; Not used if disc count is 1
-getsource = no ; Used to determine if we want source packages or not
-

config/yum.conf.f8.i386

@@ -1,29 +0,0 @@
-[main]
-#keepcache=0
-#debuglevel=2
-pkgpolicy=newest
-distroverpkg=redhat-release
-tolerant=1
-exactarch=1
-obsoletes=1
-gpgcheck=1
-reposdir=./
-#plugins=1
-metadata_expire=1800
-#exclude=\*.i?86
-
-# PUT YOUR REPOS HERE OR IN separate files named file.repo
-# in /etc/yum.repos.d
-[fedora]
-name=Fedora - 8
-#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/releases/8/Everything/i386/os/
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-8&arch=i386
-enabled=1
-gpgcheck=0
-
-[fedora-source]
-name=Fedora 8 - Source
-#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/releases/8/Everything/source/SRPMS/
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-8&arch=i386
-enabled=1
-gpgcheck=0

config/yum.conf.f8.ppc

@@ -1,29 +0,0 @@
-[main]
-#keepcache=0
-#debuglevel=2
-pkgpolicy=newest
-distroverpkg=redhat-release
-tolerant=1
-exactarch=1
-obsoletes=1
-gpgcheck=1
-reposdir=./
-#plugins=1
-metadata_expire=1800
-#exclude=\*.i?86
-
-# PUT YOUR REPOS HERE OR IN separate files named file.repo
-# in /etc/yum.repos.d
-[fedora]
-name=Fedora - 8
-#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/releases/8/Everything/ppc/os/
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-8&arch=ppc
-enabled=1
-gpgcheck=0
-
-[fedora-source]
-name=Fedora 8 - Source
-#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/releases/8/Everything/source/SRPMS/
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-8&arch=ppc
-enabled=1
-gpgcheck=0

config/yum.conf.f8.x86_64

@@ -1,29 +0,0 @@
-[main]
-#keepcache=0
-#debuglevel=2
-pkgpolicy=newest
-distroverpkg=redhat-release
-tolerant=1
-exactarch=1
-obsoletes=1
-gpgcheck=1
-reposdir=./
-#plugins=1
-metadata_expire=1800
-#exclude=\*.i?86
-
-# PUT YOUR REPOS HERE OR IN separate files named file.repo
-# in /etc/yum.repos.d
-[fedora]
-name=Fedora - 8
-#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/releases/8/Everything/x86_64/os/
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-8&arch=x86_64
-enabled=1
-gpgcheck=0
-
-[fedora-source]
-name=Fedora 8 - Source
-#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/releases/8/Everything/source/SRPMS/
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-8&arch=x86_64
-enabled=1
-gpgcheck=0

config/yum.conf.rawhide.i386

@@ -1,30 +0,0 @@
-[main]
-#keepcache=0
-#debuglevel=2
-pkgpolicy=newest
-distroverpkg=redhat-release
-tolerant=1
-exactarch=1
-obsoletes=1
-gpgcheck=1
-reposdir=./
-#plugins=1
-metadata_expire=1800
-#exclude=\*.i?86
-
-# PUT YOUR REPOS HERE OR IN separate files named file.repo
-# in /etc/yum.repos.d
-[development]
-name=Fedora - Development
-#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/development/i386/os/
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=i386
-enabled=1
-gpgcheck=0
-
-[development-source]
-name=Fedora - Development Source
-#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/development/source/SRPMS
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=i386
-enabled=1
-gpgcheck=0
-

config/yum.conf.rawhide.ppc

@@ -1,30 +0,0 @@
-[main]
-#keepcache=0
-#debuglevel=2
-pkgpolicy=newest
-distroverpkg=redhat-release
-tolerant=1
-exactarch=1
-obsoletes=1
-gpgcheck=1
-reposdir=./
-#plugins=1
-metadata_expire=1800
-#exclude=\*.i?86
-
-# PUT YOUR REPOS HERE OR IN separate files named file.repo
-# in /etc/yum.repos.d
-[development]
-name=Fedora - Development
-#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/development/ppc/os/
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=ppc
-enabled=1
-gpgcheck=0
-
-[development-source]
-name=Fedora - Development Source
-#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/development/source/SRPMS
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=ppc
-enabled=1
-gpgcheck=0
-

config/yum.conf.rawhide.x86_64

@@ -1,30 +0,0 @@
-[main]
-#keepcache=0
-#debuglevel=2
-pkgpolicy=newest
-distroverpkg=redhat-release
-tolerant=1
-exactarch=1
-obsoletes=1
-gpgcheck=1
-reposdir=./
-#plugins=1
-metadata_expire=1800
-#exclude=\*.i?86
-
-# PUT YOUR REPOS HERE OR IN separate files named file.repo
-# in /etc/yum.repos.d
-[development]
-name=Fedora - Development
-#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/development/x86_64/os/
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=x86_64
-enabled=1
-gpgcheck=0
-
-[development-source]
-name=Fedora - Development Source
-#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/development/source/SRPMS/
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=x86_64
-enabled=1
-gpgcheck=0
-

pungi

@@ -153,7 +153,7 @@ if __name__ == '__main__':
     today = time.strftime('%Y%m%d', time.localtime())
 
     def get_arguments():
-        parser = OptionParser(version="%prog 0.5.0")
+        parser = OptionParser(version="%prog 1.0.0")
 
         # Pulled in from config file to be cli options as part of pykickstart conversion
         parser.add_option("--name", default="Fedora", dest="name",

pungi.spec

@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           pungi
-Version:        0.5.0
+Version:        1.0.0
 Release:        1%{?dist}
 Summary:        Distribution compose tool
 
@@ -40,7 +40,6 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc Authors Changelog COPYING GPL README ToDo
-%config(noreplace) %{_sysconfdir}/pungi
 # For noarch packages: sitelib
 %{python_sitelib}/pypungi
 %{_bindir}/pungi
@@ -49,6 +48,23 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 27 2007 Jesse Keating <jkeating@redhat.com>
+- Add support for $releasever in repo uris.
+- Add a kickstart file usable for composing Fedora 8 "Fedora"
+- Fix bugs with $basearch and mirrorlist usage.
+- Add a cache dir for pungi (/var/cache/pungi) and a cli option to override
+- Add root check.
+- Use a kickstart file as input now (for cdsize and package manifest)
+- Remove a lot of configurable items and hard set them
+- Move some items to cli flags only (part of moving to pykickstart)
+- hard set product_path to 'Packages'
+- Use group metadata from repos instead of our own comps file
+- Get group files out of configured repos and create a mashup
+  of the comps.  Filter it and make use of it when creating repos.
+- Quiet down creatrepo calls
+- Adjust logging to make use of new facility, use right levels
+- Drop a note when all done with composing
+
 * Tue Aug 21 2007 Jesse Keating <jkeating@redhat.com> - 0.5.0-1
 - Rework how source rpms are pulled in
   Always pull in 'src' arch packages, just filter them

setup.py

@@ -2,7 +2,7 @@ from distutils.core import setup
 import glob
 
 setup(name='pungi',
-      version='0.5.0',
+      version='1.0.0',
       description='Distribution compose tool',
       author='Jesse Keating',
       author_email='jkeating@redhat.com',
@@ -10,6 +10,6 @@ setup(name='pungi',
       license='GPL',
       packages = ['pypungi'],
       scripts = ['pungi'],
-      data_files=[('/etc/pungi', glob.glob('config/*')), ('/usr/share/pungi', glob.glob('share/*'))]
+      data_files=[('/usr/share/pungi', glob.glob('share/*'))]
       )