diff --git a/Changelog b/Changelog index 88efc142..3c09bccd 100644 --- a/Changelog +++ b/Changelog @@ -2,6 +2,7 @@ - Update the comps file again from F7 - Fix the ppc boot flags - Clean up SRPM-disc junk +- add bugurl config option for anaconda betanag * Thu Jan 25 2007 Jesse Keating - Update the comps file from F7 diff --git a/config/pungi.conf b/config/pungi.conf index 67823a54..c850709d 100644 --- a/config/pungi.conf +++ b/config/pungi.conf @@ -5,6 +5,7 @@ product_name = Fedora Core product_path = Fedora iso_basename = FC +bugurl = http://bugzilla.redhat.com comps = /etc/pungi/comps-fc7.xml manifest = /etc/pungi/minimal-manifest yumconf = /etc/pungi/yum.conf.x86_64 diff --git a/pungi.spec b/pungi.spec index 052380db..ff91b4f6 100644 --- a/pungi.spec +++ b/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.2.1 +Version: 0.2.2 Release: 1%{?dist} Summary: Distribution compose tool @@ -46,6 +46,12 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jan 29 2007 Jesse Keating - 0.2.2-1 +- Update the comps file again from F7 +- Fix the ppc boot flags +- Clean up SRPM-disc junk +- add bugurl config option for anaconda betanag + * Thu Jan 25 2007 Jesse Keating - 0.2.1-1 - Add a "flavor" option (such as Desktop) - Move packageorder file into workdir diff --git a/pypungi/pungi.py b/pypungi/pungi.py index 464f3b54..f425fc86 100755 --- a/pypungi/pungi.py +++ b/pypungi/pungi.py @@ -45,9 +45,10 @@ class Pungi: os.makedirs(os.path.join(self.topdir, self.config.get('default', 'product_path'), 'base')) shutil.copy(self.config.get('default', 'comps'), os.path.join(self.topdir, self.config.get('default', 'product_path'), 'base', 'comps.xml')) - args = '--product "%s" --version %s --release "%s" --prodpath %s %s' % (self.config.get('default', 'product_name'), + args = '--product "%s" --version %s --release "%s" --prodpath %s --bugurl "%s" %s' % (self.config.get('default', 'product_name'), self.config.get('default', 'version'), '%s %s' % (self.config.get('default', 'product_name'), - self.config.get('default', 'version')), self.config.get('default', 'product_path'), self.topdir) + self.config.get('default', 'version')), self.config.get('default', 'product_path'), + self.config.get('default', 'bugurl'), self.topdir) os.system('/usr/lib/anaconda-runtime/buildinstall %s' % args) def doPackageorder(self): diff --git a/setup.py b/setup.py index fcc8d80b..34641b9f 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from distutils.core import setup import glob setup(name='pungi', - version='0.2.1', + version='0.2.2', description='Distribution compose tool', author='Jesse Keating', author_email='jkeating@redhat.com',