diff --git a/Makefile b/Makefile index 94f3e072..c99da306 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ tag: archive: @rm -rf ${PKGNAME}-$(VERSION)/ - @python setup.py sdist > /dev/null + @python setup.py sdist --formats=bztar > /dev/null @echo "The archive is in dist/${PKGNAME}-$(VERSION).tar.gz" srpm: archive diff --git a/pungi.spec b/pungi.spec index cd47adc8..d67801cf 100644 --- a/pungi.spec +++ b/pungi.spec @@ -1,14 +1,14 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: pungi -Version: 1.2.4 +Version: 1.2.6 Release: 1%{?dist} Summary: Distribution compose tool Group: Development/Tools License: GPLv2 -URL: http://hosted.fedoraproject.org/projects/pungi -Source0: http://linux.duke.edu/projects/%{name}/release/%{name}-%{version}.tar.gz +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) Requires: anaconda-runtime, yum => 3.0.3, repoview BuildRequires: python-devel @@ -55,6 +55,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jan 2 2008 jkeating 1.2.6-1 +- Update the url field for new hosted urls. +- Add k3b to the Fedora manifest. + * Mon Dec 10 2007 Jesse Keating 1.2.4-1 - Remove extra files from tarball diff --git a/setup.py b/setup.py index ca09b834..7ee4fdcd 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from distutils.core import setup import glob setup(name='pungi', - version='1.2.4', + version='1.2.6', description='Distribution compose tool', author='Jesse Keating', author_email='jkeating@redhat.com', diff --git a/src/bin/pungi.py b/src/bin/pungi.py index ac4891cb..af0d2504 100755 --- a/src/bin/pungi.py +++ b/src/bin/pungi.py @@ -121,7 +121,7 @@ if __name__ == '__main__': today = time.strftime('%Y%m%d', time.localtime()) def get_arguments(config): - parser = OptionParser(version="%prog 1.2.4") + parser = OptionParser(version="%prog 1.2.6") def set_config(option, opt_str, value, parser, config): config.set('default', option.dest, value)