From 787012b57ced1baefcba1a54cf35bdb9f9ceba37 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Tue, 30 Oct 2012 17:19:01 -0500 Subject: [PATCH] Version bump to 1.3.0pre2 Signed-off-by: Sol Jerome --- debian/changelog | 6 ++++++ misc/bcfg2-selinux.spec | 11 +++++++---- misc/bcfg2.spec | 11 +++++++---- osx/Makefile | 2 +- osx/macports/Portfile | 2 +- redhat/RELEASE | 2 +- redhat/bcfg2.spec.in | 3 +++ setup.py | 2 +- solaris/Makefile | 2 +- solaris/pkginfo.bcfg2 | 2 +- solaris/pkginfo.bcfg2-server | 2 +- src/lib/Bcfg2/Reporting/templates/base.html | 2 +- src/lib/Bcfg2/version.py | 2 +- 13 files changed, 32 insertions(+), 17 deletions(-) diff --git a/debian/changelog b/debian/changelog index 629a090e5c..fcbf7ca781 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +bcfg2 (1.3.0pre2-0.0) unstable; urgency=low + + * New upstream release + + -- Sol Jerome Tue, 30 Oct 2012 17:19:01 -0500 + bcfg2 (1.3.0pre1-0.0) unstable; urgency=low * New upstream release diff --git a/misc/bcfg2-selinux.spec b/misc/bcfg2-selinux.spec index bdee40ece1..9ed1b21644 100644 --- a/misc/bcfg2-selinux.spec +++ b/misc/bcfg2-selinux.spec @@ -9,7 +9,7 @@ Name: bcfg2-selinux Version: 1.3.0 -Release: 0.1pre1 +Release: 0.0pre2 Summary: Bcfg2 Client and Server SELinux policy %if 0%{?suse_version} @@ -24,8 +24,8 @@ Conflicts: selinux-policy = 3.11.1 License: BSD URL: http://bcfg2.org -Source0: ftp://ftp.mcs.anl.gov/pub/bcfg/bcfg2-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Source0: ftp://ftp.mcs.anl.gov/pub/bcfg/%{name}-%{version}pre2.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}pre2-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: checkpolicy, selinux-policy-devel, hardlink @@ -65,7 +65,7 @@ deployment strategies. This package includes the Bcfg2 server and client SELinux policy. %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{name}-%{version}pre2 %build cd redhat/selinux @@ -120,5 +120,8 @@ if [ $1 -eq 0 ] ; then fi %changelog +* Tue Oct 30 2012 Sol Jerome 1.3.0-0.0pre2 +- New upstream release + * Fri Sep 14 2012 Chris St. Pierre 1.3.0-0.2pre1 - Broke bcfg2-selinux into its own specfile diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec index 16c20c8342..fda162c5d6 100644 --- a/misc/bcfg2.spec +++ b/misc/bcfg2.spec @@ -6,7 +6,7 @@ Name: bcfg2 Version: 1.3.0 -Release: 0.2pre1 +Release: 0.0pre2 Summary: Configuration management system %if 0%{?suse_version} @@ -17,8 +17,8 @@ Group: Applications/System %endif License: BSD URL: http://bcfg2.org -Source0: ftp://ftp.mcs.anl.gov/pub/bcfg/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Source0: ftp://ftp.mcs.anl.gov/pub/bcfg/%{name}-%{version}pre2.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}pre2-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel @@ -267,7 +267,7 @@ deployment strategies. This package includes the Bcfg2 reports web frontend. %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{name}-%{version}pre2 %build %{__python}%{pythonversion} setup.py build @@ -445,6 +445,9 @@ fi %endif %changelog +* Tue Oct 30 2012 Sol Jerome 1.3.0-0.0pre2 +- New upstream release + * Wed Oct 17 2012 Chris St. Pierre 1.3.0-0.2pre1 - Split bcfg2-selinux into its own specfile diff --git a/osx/Makefile b/osx/Makefile index a6f8bae741..0d0bd40f95 100644 --- a/osx/Makefile +++ b/osx/Makefile @@ -29,7 +29,7 @@ SITELIBDIR = /Library/Python/${PYVERSION}/site-packages # an Info.plist file for packagemaker to look at for package creation # and substitute the version strings. Major/Minor versions can only be # integers (e.g. "1" and "00" for bcfg2 version 1.0.0. -BCFGVER = 1.3.0pre1 +BCFGVER = 1.3.0pre2 MAJOR = 1 MINOR = 30 diff --git a/osx/macports/Portfile b/osx/macports/Portfile index f4d856368a..a18337aff1 100644 --- a/osx/macports/Portfile +++ b/osx/macports/Portfile @@ -5,7 +5,7 @@ PortSystem 1.0 PortGroup python26 1.0 name bcfg2 -version 1.3.0pre1 +version 1.3.0pre2 categories sysutils python maintainers gmail.com:sol.jerome license BSD diff --git a/redhat/RELEASE b/redhat/RELEASE index 22a4ba1bd2..a0694f914a 100644 --- a/redhat/RELEASE +++ b/redhat/RELEASE @@ -1 +1 @@ -0.0pre1 +0.0pre2 diff --git a/redhat/bcfg2.spec.in b/redhat/bcfg2.spec.in index 22a0a83757..ede45a05e2 100644 --- a/redhat/bcfg2.spec.in +++ b/redhat/bcfg2.spec.in @@ -255,6 +255,9 @@ fi %doc %{_defaultdocdir}/bcfg2-doc-%{version} %changelog +* Tue Oct 30 2012 Sol Jerome 1.3.0-0.0pre2 +- New upstream release + * Fri Aug 31 2012 Sol Jerome 1.3.0-0.0pre1 - New upstream release diff --git a/setup.py b/setup.py index 00cb1e1b50..e486afb5f5 100755 --- a/setup.py +++ b/setup.py @@ -130,7 +130,7 @@ def run(self): setup(cmdclass=cmdclass, name="Bcfg2", - version="1.3.0pre1", + version="1.3.0pre2", description="Bcfg2 Server", author="Narayan Desai", author_email="desai@mcs.anl.gov", diff --git a/solaris/Makefile b/solaris/Makefile index 61bbe2db19..a5d9f1d43e 100644 --- a/solaris/Makefile +++ b/solaris/Makefile @@ -1,7 +1,7 @@ #!/usr/sfw/bin/gmake PYTHON="/usr/local/bin/python" -VERS=1.3.0pre1-1 +VERS=1.3.0pre2-1 PYVERSION := $(shell $(PYTHON) -c "import sys; print sys.version[0:3]") default: clean package diff --git a/solaris/pkginfo.bcfg2 b/solaris/pkginfo.bcfg2 index 0df8a5e8b3..57601b4199 100644 --- a/solaris/pkginfo.bcfg2 +++ b/solaris/pkginfo.bcfg2 @@ -1,7 +1,7 @@ PKG="SCbcfg2" NAME="bcfg2" ARCH="sparc" -VERSION="1.3.0pre1" +VERSION="1.3.0pre2" CATEGORY="application" VENDOR="Argonne National Labratory" EMAIL="bcfg-dev@mcs.anl.gov" diff --git a/solaris/pkginfo.bcfg2-server b/solaris/pkginfo.bcfg2-server index 607dfcd33a..3ce2ce0ac3 100644 --- a/solaris/pkginfo.bcfg2-server +++ b/solaris/pkginfo.bcfg2-server @@ -1,7 +1,7 @@ PKG="SCbcfg2-server" NAME="bcfg2-server" ARCH="sparc" -VERSION="1.3.0pre1" +VERSION="1.3.0pre2" CATEGORY="application" VENDOR="Argonne National Labratory" EMAIL="bcfg-dev@mcs.anl.gov" diff --git a/src/lib/Bcfg2/Reporting/templates/base.html b/src/lib/Bcfg2/Reporting/templates/base.html index 6d20f86d95..d3ee882622 100644 --- a/src/lib/Bcfg2/Reporting/templates/base.html +++ b/src/lib/Bcfg2/Reporting/templates/base.html @@ -88,7 +88,7 @@

{% block pagebanner %}Page Banner{% endblock %}

diff --git a/src/lib/Bcfg2/version.py b/src/lib/Bcfg2/version.py index 09b8e51537..b4ac477693 100644 --- a/src/lib/Bcfg2/version.py +++ b/src/lib/Bcfg2/version.py @@ -2,7 +2,7 @@ import re -__version__ = "1.3.0pre1" +__version__ = "1.3.0pre2" class Bcfg2VersionInfo(tuple):