summaryrefslogtreecommitdiffstats
path: root/ipa-server
diff options
context:
space:
mode:
authorSimo Sorce <ssorce@redhat.com>2007-12-21 11:53:31 -0500
committerSimo Sorce <ssorce@redhat.com>2007-12-21 11:53:31 -0500
commitb72905817ab0ca79036ee33bcb0151bbef08f20f (patch)
treef1116891514969e2343a1dd77c4bedb58a076765 /ipa-server
parented50c663e8b7d0949192c0aca5204ae7327c69bc (diff)
parentc761409490017fa3b192fedae17e6d3e4a5b2748 (diff)
downloadfreeipa-b72905817ab0ca79036ee33bcb0151bbef08f20f.tar.gz
freeipa-b72905817ab0ca79036ee33bcb0151bbef08f20f.tar.xz
freeipa-b72905817ab0ca79036ee33bcb0151bbef08f20f.zip
Merge version changes with upstream
Diffstat (limited to 'ipa-server')
-rw-r--r--ipa-server/configure.ac2
-rwxr-xr-xipa-server/ipa-server.spec5
-rw-r--r--ipa-server/ipa-server.spec.in3
3 files changed, 8 insertions, 2 deletions
diff --git a/ipa-server/configure.ac b/ipa-server/configure.ac
index ec448c42d..5f9b452c4 100644
--- a/ipa-server/configure.ac
+++ b/ipa-server/configure.ac
@@ -1,6 +1,6 @@
AC_PREREQ(2.59)
AC_INIT([ipa-server],
- [0.5],
+ [0.6.0],
[https://hosted.fedoraproject.org/projects/freeipa/newticket])
AC_CONFIG_SRCDIR([ipaserver/ipaldap.py])
diff --git a/ipa-server/ipa-server.spec b/ipa-server/ipa-server.spec
index 38725cf34..3722919be 100755
--- a/ipa-server/ipa-server.spec
+++ b/ipa-server/ipa-server.spec
@@ -1,5 +1,5 @@
Name: ipa-server
-Version: 0.5.0
+Version: 0.6.0
Release: 1%{?dist}
Summary: Ipa authentication server
@@ -109,6 +109,9 @@ fi
%changelog
+* Fri Dec 21 2007 Karl MacMillan <kmacmill@redhat.com> - 0.6.0-1
+- Version bump for release
+
* Wed Nov 21 2007 Karl MacMillan <kmacmill@mentalrootkit.com> - 0.5.0-1
- Preverse mode on ipa-keytab-util
- Version bump for relase and rpm name change
diff --git a/ipa-server/ipa-server.spec.in b/ipa-server/ipa-server.spec.in
index e43f07aa2..991c17585 100644
--- a/ipa-server/ipa-server.spec.in
+++ b/ipa-server/ipa-server.spec.in
@@ -109,6 +109,9 @@ fi
%changelog
+* Fri Dec 21 2007 Karl MacMillan <kmacmill@redhat.com> - 0.6.0-1
+- Version bump for release
+
* Wed Nov 21 2007 Karl MacMillan <kmacmill@mentalrootkit.com> - 0.5.0-1
- Preverse mode on ipa-keytab-util
- Version bump for relase and rpm name change