Skip to content

Commit

Permalink
Version bump to 1.3.0pre2
Browse files Browse the repository at this point in the history
Signed-off-by: Sol Jerome <[email protected]>
  • Loading branch information
solj committed Oct 30, 2012
1 parent 6a5cecf commit 787012b
Show file tree
Hide file tree
Showing 13 changed files with 32 additions and 17 deletions.
6 changes: 6 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
bcfg2 (1.3.0pre2-0.0) unstable; urgency=low

* New upstream release

-- Sol Jerome <[email protected]> Tue, 30 Oct 2012 17:19:01 -0500

bcfg2 (1.3.0pre1-0.0) unstable; urgency=low

* New upstream release
Expand Down
11 changes: 7 additions & 4 deletions misc/bcfg2-selinux.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -120,5 +120,8 @@ if [ $1 -eq 0 ] ; then
fi

%changelog
* Tue Oct 30 2012 Sol Jerome <[email protected]> 1.3.0-0.0pre2
- New upstream release

* Fri Sep 14 2012 Chris St. Pierre <[email protected]> 1.3.0-0.2pre1
- Broke bcfg2-selinux into its own specfile
11 changes: 7 additions & 4 deletions misc/bcfg2.spec
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

Name: bcfg2
Version: 1.3.0
Release: 0.2pre1
Release: 0.0pre2
Summary: Configuration management system

%if 0%{?suse_version}
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -445,6 +445,9 @@ fi
%endif

%changelog
* Tue Oct 30 2012 Sol Jerome <[email protected]> 1.3.0-0.0pre2
- New upstream release

* Wed Oct 17 2012 Chris St. Pierre <[email protected]> 1.3.0-0.2pre1
- Split bcfg2-selinux into its own specfile

Expand Down
2 changes: 1 addition & 1 deletion osx/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion osx/macports/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion redhat/RELEASE
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.0pre1
0.0pre2
3 changes: 3 additions & 0 deletions redhat/bcfg2.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,9 @@ fi
%doc %{_defaultdocdir}/bcfg2-doc-%{version}

%changelog
* Tue Oct 30 2012 Sol Jerome <[email protected]> 1.3.0-0.0pre2
- New upstream release

* Fri Aug 31 2012 Sol Jerome <[email protected]> 1.3.0-0.0pre1
- New upstream release

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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="[email protected]",
Expand Down
2 changes: 1 addition & 1 deletion solaris/Makefile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion solaris/pkginfo.bcfg2
Original file line number Diff line number Diff line change
@@ -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="[email protected]"
Expand Down
2 changes: 1 addition & 1 deletion solaris/pkginfo.bcfg2-server
Original file line number Diff line number Diff line change
@@ -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="[email protected]"
Expand Down
2 changes: 1 addition & 1 deletion src/lib/Bcfg2/Reporting/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ <h1>{% block pagebanner %}Page Banner{% endblock %}</h1>
<div style='clear:both'></div>
</div><!-- document -->
<div id="footer">
<span>Bcfg2 Version 1.3.0pre1</span>
<span>Bcfg2 Version 1.3.0pre2</span>
</div>

<div id="calendar_div" style='position:absolute; visibility:hidden; background-color:white; layer-background-color:white;'></div>
Expand Down
2 changes: 1 addition & 1 deletion src/lib/Bcfg2/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import re

__version__ = "1.3.0pre1"
__version__ = "1.3.0pre2"


class Bcfg2VersionInfo(tuple):
Expand Down

0 comments on commit 787012b

Please sign in to comment.