summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2013-01-09 10:48:22 -0600
committerSol Jerome <sol.jerome@gmail.com>2013-01-09 10:48:22 -0600
commit09e919aad1ad23e29ff9b88289a546184628e187 (patch)
tree1b07c600c4e5b2ad60dd1403575e41312fc2419e
parente39df14d477ece1971bd833d875bcc6f89d6ffc1 (diff)
downloadbcfg2-09e919aad1ad23e29ff9b88289a546184628e187.tar.gz
bcfg2-09e919aad1ad23e29ff9b88289a546184628e187.tar.bz2
bcfg2-09e919aad1ad23e29ff9b88289a546184628e187.zip
Version bump to 1.3.0rc1
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
-rw-r--r--debian/changelog6
-rw-r--r--misc/bcfg2-selinux.spec11
-rw-r--r--misc/bcfg2.spec11
-rw-r--r--osx/Makefile2
-rw-r--r--osx/macports/Portfile2
-rw-r--r--redhat/RELEASE2
-rw-r--r--redhat/bcfg2.spec.in3
-rwxr-xr-xsetup.py2
-rw-r--r--solaris/Makefile2
-rw-r--r--solaris/pkginfo.bcfg22
-rw-r--r--solaris/pkginfo.bcfg2-server2
-rw-r--r--src/lib/Bcfg2/Reporting/templates/base.html2
-rw-r--r--src/lib/Bcfg2/version.py2
13 files changed, 32 insertions, 17 deletions
diff --git a/debian/changelog b/debian/changelog
index fcbf7ca78..6871a2f65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+bcfg2 (1.3.0rc1-0.0) unstable; urgency=low
+
+ * New upstream release
+
+ -- Sol Jerome <sol.jerome@gmail.com> Wed, 09 Jan 2013 10:48:22 -0600
+
bcfg2 (1.3.0pre2-0.0) unstable; urgency=low
* New upstream release
diff --git a/misc/bcfg2-selinux.spec b/misc/bcfg2-selinux.spec
index 9ed1b2164..f8e6dbeb1 100644
--- a/misc/bcfg2-selinux.spec
+++ b/misc/bcfg2-selinux.spec
@@ -9,7 +9,7 @@
Name: bcfg2-selinux
Version: 1.3.0
-Release: 0.0pre2
+Release: 0.0rc1
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/%{name}-%{version}pre2.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}pre2-%{release}-root-%(%{__id_u} -n)
+Source0: ftp://ftp.mcs.anl.gov/pub/bcfg/%{name}-%{version}rc1.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}rc1-%{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}pre2
+%setup -q -n %{name}-%{version}rc1
%build
cd redhat/selinux
@@ -120,6 +120,9 @@ if [ $1 -eq 0 ] ; then
fi
%changelog
+* Wed Jan 09 2013 Sol Jerome <sol.jerome@gmail.com> 1.3.0-0.0rc1
+- New upstream release
+
* Tue Oct 30 2012 Sol Jerome <sol.jerome@gmail.com> 1.3.0-0.0pre2
- New upstream release
diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec
index 59cdd1f63..a798471af 100644
--- a/misc/bcfg2.spec
+++ b/misc/bcfg2.spec
@@ -6,7 +6,7 @@
Name: bcfg2
Version: 1.3.0
-Release: 0.0pre2
+Release: 0.0rc1
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}pre2.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}pre2-%{release}-root-%(%{__id_u} -n)
+Source0: ftp://ftp.mcs.anl.gov/pub/bcfg/%{name}-%{version}rc1.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}rc1-%{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}pre2
+%setup -q -n %{name}-%{version}rc1
%build
%{__python}%{pythonversion} setup.py build
@@ -443,6 +443,9 @@ fi
%endif
%changelog
+* Wed Jan 09 2013 Sol Jerome <sol.jerome@gmail.com> 1.3.0-0.0rc1
+- New upstream release
+
* Tue Oct 30 2012 Sol Jerome <sol.jerome@gmail.com> 1.3.0-0.0pre2
- New upstream release
diff --git a/osx/Makefile b/osx/Makefile
index 0d0bd40f9..dd6f19e2e 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.0pre2
+BCFGVER = 1.3.0rc1
MAJOR = 1
MINOR = 30
diff --git a/osx/macports/Portfile b/osx/macports/Portfile
index a18337aff..77e930c7f 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.0pre2
+version 1.3.0rc1
categories sysutils python
maintainers gmail.com:sol.jerome
license BSD
diff --git a/redhat/RELEASE b/redhat/RELEASE
index a0694f914..888c3a4b3 100644
--- a/redhat/RELEASE
+++ b/redhat/RELEASE
@@ -1 +1 @@
-0.0pre2
+0.0rc1
diff --git a/redhat/bcfg2.spec.in b/redhat/bcfg2.spec.in
index 2f4904710..9527cae7b 100644
--- a/redhat/bcfg2.spec.in
+++ b/redhat/bcfg2.spec.in
@@ -250,6 +250,9 @@ fi
%doc %{_defaultdocdir}/bcfg2-doc-%{version}
%changelog
+* Wed Jan 09 2013 Sol Jerome <sol.jerome@gmail.com> 1.3.0-0.0rc1
+- New upstream release
+
* Tue Oct 30 2012 Sol Jerome <sol.jerome@gmail.com> 1.3.0-0.0pre2
- New upstream release
diff --git a/setup.py b/setup.py
index 3fb42e585..509615627 100755
--- a/setup.py
+++ b/setup.py
@@ -23,7 +23,7 @@ if need_m2crypto:
inst_reqs.append('M2Crypto')
setup(name="Bcfg2",
- version="1.3.0pre2",
+ version="1.3.0rc1",
description="Bcfg2 Server",
author="Narayan Desai",
author_email="desai@mcs.anl.gov",
diff --git a/solaris/Makefile b/solaris/Makefile
index a5d9f1d43..749e6ad79 100644
--- a/solaris/Makefile
+++ b/solaris/Makefile
@@ -1,7 +1,7 @@
#!/usr/sfw/bin/gmake
PYTHON="/usr/local/bin/python"
-VERS=1.3.0pre2-1
+VERS=1.3.0rc1-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 57601b419..09d91eb1f 100644
--- a/solaris/pkginfo.bcfg2
+++ b/solaris/pkginfo.bcfg2
@@ -1,7 +1,7 @@
PKG="SCbcfg2"
NAME="bcfg2"
ARCH="sparc"
-VERSION="1.3.0pre2"
+VERSION="1.3.0rc1"
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 3ce2ce0ac..f7f6258d1 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.0pre2"
+VERSION="1.3.0rc1"
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 d3ee88262..1ec6b8c24 100644
--- a/src/lib/Bcfg2/Reporting/templates/base.html
+++ b/src/lib/Bcfg2/Reporting/templates/base.html
@@ -88,7 +88,7 @@
<div style='clear:both'></div>
</div><!-- document -->
<div id="footer">
- <span>Bcfg2 Version 1.3.0pre2</span>
+ <span>Bcfg2 Version 1.3.0rc1</span>
</div>
<div id="calendar_div" style='position:absolute; visibility:hidden; background-color:white; layer-background-color:white;'></div>
diff --git a/src/lib/Bcfg2/version.py b/src/lib/Bcfg2/version.py
index f83863cce..86803afcb 100644
--- a/src/lib/Bcfg2/version.py
+++ b/src/lib/Bcfg2/version.py
@@ -2,7 +2,7 @@
import re
-__version__ = "1.3.0pre2"
+__version__ = "1.3.0rc1"
class Bcfg2VersionInfo(tuple):