From 039d7fa675dd487219f7f67ff34b2f9b33e9c1a8 Mon Sep 17 00:00:00 2001 From: Narayan Desai Date: Thu, 29 Jan 2009 21:40:23 +0000 Subject: Version bump to 1.0pre1 git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5050 ce84e21b-d406-0410-9b95-82705330c041 --- debian/changelog | 6 ++++ gentoo/bcfg2-0.9.6_pre1.ebuild | 71 ------------------------------------------ gentoo/bcfg2-1.0_pre1.ebuild | 71 ++++++++++++++++++++++++++++++++++++++++++ misc/bcfg2.spec | 6 ++-- redhat/VERSION | 2 +- setup.py | 2 +- 6 files changed, 82 insertions(+), 76 deletions(-) delete mode 100644 gentoo/bcfg2-0.9.6_pre1.ebuild create mode 100644 gentoo/bcfg2-1.0_pre1.ebuild diff --git a/debian/changelog b/debian/changelog index 1abc14a93..ba9dd96d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +bcfg2 (1.0pre1-0.0) unstable; urgency=low + + * new prerelease + + -- Narayan Desai Thu, 29 Jan 2009 15:36:44 -0600 + bcfg2 (0.9.6-0.1) unstable; urgency=low * Final release! diff --git a/gentoo/bcfg2-0.9.6_pre1.ebuild b/gentoo/bcfg2-0.9.6_pre1.ebuild deleted file mode 100644 index 494588d0e..000000000 --- a/gentoo/bcfg2-0.9.6_pre1.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2004 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -DESCRIPTION="Bcfg2 is a configuration management tool. Package includes client -and server." -HOMEPAGE="http://trac.mcs.anl.gov/projects/bcfg2" - -# handle the "pre" case -MY_P="${P/_/}" -SRC_URI="ftp://ftp.mcs.anl.gov/pub/bcfg/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="BSD" -RESTRICT="mirror" - -SLOT="0" -KEYWORDS="~x86 ~amd64" -IUSE="server" - -DEPEND=" - app-portage/gentoolkit - - || ( >=dev-lang/python-2.5 - ( - >=dev-lang/python-2.3 - || ( dev-python/elementtree dev-python/lxml ) - ) - ) - " - -RDEPEND=" - server? ( - dev-python/pyopenssl - || ( app-admin/gamin app-admin/fam ) - ) - " - -src_compile() { - python setup.py build -} - -src_install() { - python setup.py install \ - --root=${D} \ - --record=PY_SERVER_LIBS \ - --install-scripts /usr/sbin - - # Remove files only necessary for a server installation - if ! use server; then - rm -rf ${D}/usr/sbin/bcfg2-* - rm -rf ${D}/usr/share/bcfg2 - rm -rf ${D}/usr/share/man/man8 - fi - - # Install a server init.d script - if use server; then - newinitd ${FILESDIR}/bcfg2-server.rc bcfg2-server - fi - - insinto /etc - doins ${S}/examples/bcfg2.conf -} - -pkg_postinst () { - depscan.sh -} - -pkg_postrm () { - depscan.sh -} diff --git a/gentoo/bcfg2-1.0_pre1.ebuild b/gentoo/bcfg2-1.0_pre1.ebuild new file mode 100644 index 000000000..494588d0e --- /dev/null +++ b/gentoo/bcfg2-1.0_pre1.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2004 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +DESCRIPTION="Bcfg2 is a configuration management tool. Package includes client +and server." +HOMEPAGE="http://trac.mcs.anl.gov/projects/bcfg2" + +# handle the "pre" case +MY_P="${P/_/}" +SRC_URI="ftp://ftp.mcs.anl.gov/pub/bcfg/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="BSD" +RESTRICT="mirror" + +SLOT="0" +KEYWORDS="~x86 ~amd64" +IUSE="server" + +DEPEND=" + app-portage/gentoolkit + + || ( >=dev-lang/python-2.5 + ( + >=dev-lang/python-2.3 + || ( dev-python/elementtree dev-python/lxml ) + ) + ) + " + +RDEPEND=" + server? ( + dev-python/pyopenssl + || ( app-admin/gamin app-admin/fam ) + ) + " + +src_compile() { + python setup.py build +} + +src_install() { + python setup.py install \ + --root=${D} \ + --record=PY_SERVER_LIBS \ + --install-scripts /usr/sbin + + # Remove files only necessary for a server installation + if ! use server; then + rm -rf ${D}/usr/sbin/bcfg2-* + rm -rf ${D}/usr/share/bcfg2 + rm -rf ${D}/usr/share/man/man8 + fi + + # Install a server init.d script + if use server; then + newinitd ${FILESDIR}/bcfg2-server.rc bcfg2-server + fi + + insinto /etc + doins ${S}/examples/bcfg2.conf +} + +pkg_postinst () { + depscan.sh +} + +pkg_postrm () { + depscan.sh +} diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec index d6e79be4d..2811ee605 100644 --- a/misc/bcfg2.spec +++ b/misc/bcfg2.spec @@ -13,14 +13,14 @@ %define lxmldep %(rpm -q %{alt_lxml} 2>&1 > /dev/null && echo %{alt_lxml} || echo %{dfl_lxml}) Name: bcfg2 -Version: 0.9.6 +Version: 1.0pre1 Release: %{release} Summary: Configuration management system Group: Applications/System License: BSD URL: http://trac.mcs.anl.gov/projects/bcfg2 -Source0: ftp://ftp.mcs.anl.gov/pub/bcfg/bcfg2-0.9.6.tar.gz +Source0: ftp://ftp.mcs.anl.gov/pub/bcfg/bcfg2-1.0pre1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -91,7 +91,7 @@ Bcfg2 can enable the construction of complex change management and deployment strategies. %prep -%setup -q -n bcfg2-0.9.6 +%setup -q -n bcfg2-1.0pre1 %build %{__python}%{pythonversion} setup.py build diff --git a/redhat/VERSION b/redhat/VERSION index 85b7c695b..d7749a2da 100644 --- a/redhat/VERSION +++ b/redhat/VERSION @@ -1 +1 @@ -0.9.6 +1.0pre1 diff --git a/setup.py b/setup.py index 85538dd29..72d240f1c 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ from distutils.core import setup from glob import glob setup(name="Bcfg2", - version="0.9.6", + version="1.0pre1", description="Bcfg2 Server", author="Narayan Desai", author_email="desai@mcs.anl.gov", -- cgit v1.2.3-1-g7c22