Merge version changes with upstream

2025-02-25 18:55:28 -06:00 · 2007-12-21 11:53:31 -05:00 · 2007-12-21 11:53:31 -05:00 · b72905817a
commit b72905817a
parent ed50c663e8 c761409490
16 changed files with 52 additions and 16 deletions
--- a/12
+++ b/12
@ -8,42 +8,42 @@ RPMBUILD ?= $(PWD)/rpmbuild
 # updating this you should run the version-update
 # target.
 SERV_MAJOR=0
-SERV_MINOR=5
+SERV_MINOR=6
 SERV_RELEASE=0
 SERV_VERSION=$(SERV_MAJOR).$(SERV_MINOR).$(SERV_RELEASE)
 SERV_TARBALL_PREFIX=$(PRJ_PREFIX)-server-$(SERV_VERSION)
 SERV_TARBALL=$(SERV_TARBALL_PREFIX).tgz

 ADMIN_MAJOR=0
-ADMIN_MINOR=5
+ADMIN_MINOR=6
 ADMIN_RELEASE=0
 ADMIN_VERSION=$(ADMIN_MAJOR).$(ADMIN_MINOR).$(ADMIN_RELEASE)
 ADMIN_TARBALL_PREFIX=$(PRJ_PREFIX)-admintools-$(ADMIN_VERSION)
 ADMIN_TARBALL=$(ADMIN_TARBALL_PREFIX).tgz

 PYTHON_MAJOR=0
-PYTHON_MINOR=5
+PYTHON_MINOR=6
 PYTHON_RELEASE=0
 PYTHON_VERSION=$(PYTHON_MAJOR).$(PYTHON_MINOR).$(PYTHON_RELEASE)
 PYTHON_TARBALL_PREFIX=$(PRJ_PREFIX)-python-$(PYTHON_VERSION)
 PYTHON_TARBALL=$(PYTHON_TARBALL_PREFIX).tgz

 CLI_MAJOR=0
-CLI_MINOR=5
+CLI_MINOR=6
 CLI_RELEASE=0
 CLI_VERSION=$(CLI_MAJOR).$(CLI_MINOR).$(CLI_RELEASE)
 CLI_TARBALL_PREFIX=$(PRJ_PREFIX)-client-$(CLI_VERSION)
 CLI_TARBALL=$(CLI_TARBALL_PREFIX).tgz

 RADIUS_SERVER_MAJOR=0
-RADIUS_SERVER_MINOR=5
+RADIUS_SERVER_MINOR=6
 RADIUS_SERVER_RELEASE=0
 RADIUS_SERVER_VERSION=$(RADIUS_SERVER_MAJOR).$(RADIUS_SERVER_MINOR).$(RADIUS_SERVER_RELEASE)
 RADIUS_SERVER_TARBALL_PREFIX=$(PRJ_PREFIX)-radius-server-$(RADIUS_SERVER_VERSION)
 RADIUS_SERVER_TARBALL=$(RADIUS_SERVER_TARBALL_PREFIX).tgz

 RADIUS_ADMINTOOLS_MAJOR=0
-RADIUS_ADMINTOOLS_MINOR=5
+RADIUS_ADMINTOOLS_MINOR=6
 RADIUS_ADMINTOOLS_RELEASE=0
 RADIUS_ADMINTOOLS_VERSION=$(RADIUS_ADMINTOOLS_MAJOR).$(RADIUS_ADMINTOOLS_MINOR).$(RADIUS_ADMINTOOLS_RELEASE)
 RADIUS_ADMINTOOLS_TARBALL_PREFIX=$(PRJ_PREFIX)-radius-admintools-$(RADIUS_ADMINTOOLS_VERSION)
--- a/ipa-admintools/ipa-admintools.spec
+++ b/ipa-admintools/ipa-admintools.spec
@ -1,5 +1,5 @@
 Name:           ipa-admintools
-Version:        0.5.0
+Version:        0.6.0
 Release:        1%{?dist}
 Summary:        IPA authentication server

@ -35,6 +35,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/*

 %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@redhat.com> - 0.5.0-1
 - Version bump for release and rpm name change

--- a/ipa-admintools/ipa-admintools.spec.in
+++ b/ipa-admintools/ipa-admintools.spec.in
@ -35,6 +35,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/*

 %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@redhat.com> - 0.5.0-1
 - Version bump for release and rpm name change

--- a/ipa-client/configure.ac
+++ b/ipa-client/configure.ac
@ -1,6 +1,6 @@
 AC_PREREQ(2.59)
 AC_INIT([ipa-client],
-        [0.5.0],
+        [0.6.0],
        [https://hosted.fedoraproject.org/projects/freeipa/newticket])

 AC_CONFIG_SRCDIR([ipaclient/__init__.py])
--- a/ipa-client/ipa-client.spec
+++ b/ipa-client/ipa-client.spec
@ -1,5 +1,5 @@
 Name:           ipa-client
-Version:        0.5.0
+Version:        0.6.0
 Release:        1%{?dist}
 Summary:        IPA client

@ -42,6 +42,9 @@ rm -rf %{buildroot}
 %{_usr}/share/ipa/*

 %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@redhat.com> - 0.5.0-1
 - Version bump for release and rpm name change

--- a/ipa-client/ipa-client.spec.in
+++ b/ipa-client/ipa-client.spec.in
@ -42,6 +42,9 @@ rm -rf %{buildroot}
 %{_usr}/share/ipa/*

 %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@redhat.com> - 0.5.0-1
 - Version bump for release and rpm name change

--- a/ipa-python/ipa-python.spec
+++ b/ipa-python/ipa-python.spec
@ -1,5 +1,5 @@
 Name:           ipa-python
-Version:        0.5.0
+Version:        0.6.0
 Release:        1%{?dist}
 Summary:        Ipa authentication server

@ -35,6 +35,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/ipa/ipa.conf

 %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@redhat.com> - 0.5.0-1
 - Version bump for release and rename of rpm

--- a/ipa-python/ipa-python.spec.in
+++ b/ipa-python/ipa-python.spec.in
@ -35,6 +35,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/ipa/ipa.conf

 %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@redhat.com> - 0.5.0-1
 - Version bump for release and rename of rpm

--- a/ipa-python/setup.py
+++ b/ipa-python/setup.py
@ -35,10 +35,10 @@ def setup_package():
    try:
        setup(
            name = "ipa",
-            version = "0.5.0",
+            version = "0.6.0",
            license = "GPL",
            author = "Karl MacMillan, et.al.",
-            author_email = "kmacmillan@redhat.com",
+            author_email = "kmacmill@redhat.com",
            maintainer = "freeIPA Developers",
            maintainer_email = "freeipa-devel@redhat.com",
            url = "http://www.freeipa.org/",
--- a/ipa-radius-admintools/ipa-radius-admintools.spec
+++ b/ipa-radius-admintools/ipa-radius-admintools.spec
@ -1,5 +1,5 @@
 Name:           ipa-radius-admintools
-Version:        0.5.0
+Version:        0.6.0
 Release:        1%{?dist}
 Summary:        IPA authentication server - radius admin tools

@ -34,5 +34,8 @@ rm -rf %{buildroot}
 %{_sbindir}/ipa*

 %changelog
+* Fri Dec 21 2007 Karl MacMillan <kmacmill@redhat.com> - 0.6.0-1
+- Version bump for release
+
 * Tue Dec 18 2007 Karl MacMillan <kmacmill@redhat.com> - 0.5.0
 - Initial rpm version
--- a/ipa-radius-admintools/ipa-radius-admintools.spec.in
+++ b/ipa-radius-admintools/ipa-radius-admintools.spec.in
@ -34,5 +34,8 @@ rm -rf %{buildroot}
 %{_sbindir}/ipa*

 %changelog
+* Fri Dec 21 2007 Karl MacMillan <kmacmill@redhat.com> - 0.6.0-1
+- Version bump for release
+
 * Tue Dec 18 2007 Karl MacMillan <kmacmill@redhat.com> - 0.5.0
 - Initial rpm version
--- a/ipa-radius-server/ipa-radius-server.spec
+++ b/ipa-radius-server/ipa-radius-server.spec
@ -1,5 +1,5 @@
 Name:           ipa-radius-server
-Version:        0.5.0
+Version:        0.6.0
 Release:        1%{?dist}
 Summary:        IPA authentication server - radius plugin

@ -42,6 +42,9 @@ rm -rf %{buildroot}
 %{_usr}/share/ipa/ipaserver/plugins/*

 %changelog
+* Fri Dec 21 2007 Karl MacMillan <kmacmill@redhat.com> - 0.6.0-1
+- Version bump for release
+
 * Wed Dec 12 2007 Karl MacMillan <kmacmill@redhat.com> - 0.5.0-1
 - Initial version

--- a/ipa-radius-server/ipa-radius-server.spec.in
+++ b/ipa-radius-server/ipa-radius-server.spec.in
@ -42,6 +42,9 @@ rm -rf %{buildroot}
 %{_usr}/share/ipa/ipaserver/plugins/*

 %changelog
+* Fri Dec 21 2007 Karl MacMillan <kmacmill@redhat.com> - VERSION-1
+- Version bump for release
+
 * Wed Dec 12 2007 Karl MacMillan <kmacmill@redhat.com> - 0.5.0-1
 - Initial version

--- 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])
--- 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
--- 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