Merge version changes with upstream

This commit is contained in:
Simo Sorce
2007-12-21 11:53:31 -05:00
16 changed files with 52 additions and 16 deletions

View File

@@ -8,42 +8,42 @@ RPMBUILD ?= $(PWD)/rpmbuild
# updating this you should run the version-update # updating this you should run the version-update
# target. # target.
SERV_MAJOR=0 SERV_MAJOR=0
SERV_MINOR=5 SERV_MINOR=6
SERV_RELEASE=0 SERV_RELEASE=0
SERV_VERSION=$(SERV_MAJOR).$(SERV_MINOR).$(SERV_RELEASE) SERV_VERSION=$(SERV_MAJOR).$(SERV_MINOR).$(SERV_RELEASE)
SERV_TARBALL_PREFIX=$(PRJ_PREFIX)-server-$(SERV_VERSION) SERV_TARBALL_PREFIX=$(PRJ_PREFIX)-server-$(SERV_VERSION)
SERV_TARBALL=$(SERV_TARBALL_PREFIX).tgz SERV_TARBALL=$(SERV_TARBALL_PREFIX).tgz
ADMIN_MAJOR=0 ADMIN_MAJOR=0
ADMIN_MINOR=5 ADMIN_MINOR=6
ADMIN_RELEASE=0 ADMIN_RELEASE=0
ADMIN_VERSION=$(ADMIN_MAJOR).$(ADMIN_MINOR).$(ADMIN_RELEASE) ADMIN_VERSION=$(ADMIN_MAJOR).$(ADMIN_MINOR).$(ADMIN_RELEASE)
ADMIN_TARBALL_PREFIX=$(PRJ_PREFIX)-admintools-$(ADMIN_VERSION) ADMIN_TARBALL_PREFIX=$(PRJ_PREFIX)-admintools-$(ADMIN_VERSION)
ADMIN_TARBALL=$(ADMIN_TARBALL_PREFIX).tgz ADMIN_TARBALL=$(ADMIN_TARBALL_PREFIX).tgz
PYTHON_MAJOR=0 PYTHON_MAJOR=0
PYTHON_MINOR=5 PYTHON_MINOR=6
PYTHON_RELEASE=0 PYTHON_RELEASE=0
PYTHON_VERSION=$(PYTHON_MAJOR).$(PYTHON_MINOR).$(PYTHON_RELEASE) PYTHON_VERSION=$(PYTHON_MAJOR).$(PYTHON_MINOR).$(PYTHON_RELEASE)
PYTHON_TARBALL_PREFIX=$(PRJ_PREFIX)-python-$(PYTHON_VERSION) PYTHON_TARBALL_PREFIX=$(PRJ_PREFIX)-python-$(PYTHON_VERSION)
PYTHON_TARBALL=$(PYTHON_TARBALL_PREFIX).tgz PYTHON_TARBALL=$(PYTHON_TARBALL_PREFIX).tgz
CLI_MAJOR=0 CLI_MAJOR=0
CLI_MINOR=5 CLI_MINOR=6
CLI_RELEASE=0 CLI_RELEASE=0
CLI_VERSION=$(CLI_MAJOR).$(CLI_MINOR).$(CLI_RELEASE) CLI_VERSION=$(CLI_MAJOR).$(CLI_MINOR).$(CLI_RELEASE)
CLI_TARBALL_PREFIX=$(PRJ_PREFIX)-client-$(CLI_VERSION) CLI_TARBALL_PREFIX=$(PRJ_PREFIX)-client-$(CLI_VERSION)
CLI_TARBALL=$(CLI_TARBALL_PREFIX).tgz CLI_TARBALL=$(CLI_TARBALL_PREFIX).tgz
RADIUS_SERVER_MAJOR=0 RADIUS_SERVER_MAJOR=0
RADIUS_SERVER_MINOR=5 RADIUS_SERVER_MINOR=6
RADIUS_SERVER_RELEASE=0 RADIUS_SERVER_RELEASE=0
RADIUS_SERVER_VERSION=$(RADIUS_SERVER_MAJOR).$(RADIUS_SERVER_MINOR).$(RADIUS_SERVER_RELEASE) 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_PREFIX=$(PRJ_PREFIX)-radius-server-$(RADIUS_SERVER_VERSION)
RADIUS_SERVER_TARBALL=$(RADIUS_SERVER_TARBALL_PREFIX).tgz RADIUS_SERVER_TARBALL=$(RADIUS_SERVER_TARBALL_PREFIX).tgz
RADIUS_ADMINTOOLS_MAJOR=0 RADIUS_ADMINTOOLS_MAJOR=0
RADIUS_ADMINTOOLS_MINOR=5 RADIUS_ADMINTOOLS_MINOR=6
RADIUS_ADMINTOOLS_RELEASE=0 RADIUS_ADMINTOOLS_RELEASE=0
RADIUS_ADMINTOOLS_VERSION=$(RADIUS_ADMINTOOLS_MAJOR).$(RADIUS_ADMINTOOLS_MINOR).$(RADIUS_ADMINTOOLS_RELEASE) RADIUS_ADMINTOOLS_VERSION=$(RADIUS_ADMINTOOLS_MAJOR).$(RADIUS_ADMINTOOLS_MINOR).$(RADIUS_ADMINTOOLS_RELEASE)
RADIUS_ADMINTOOLS_TARBALL_PREFIX=$(PRJ_PREFIX)-radius-admintools-$(RADIUS_ADMINTOOLS_VERSION) RADIUS_ADMINTOOLS_TARBALL_PREFIX=$(PRJ_PREFIX)-radius-admintools-$(RADIUS_ADMINTOOLS_VERSION)

View File

@@ -1,5 +1,5 @@
Name: ipa-admintools Name: ipa-admintools
Version: 0.5.0 Version: 0.6.0
Release: 1%{?dist} Release: 1%{?dist}
Summary: IPA authentication server Summary: IPA authentication server
@@ -35,6 +35,9 @@ rm -rf %{buildroot}
%{_mandir}/man1/* %{_mandir}/man1/*
%changelog %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 * Wed Nov 21 2007 Karl MacMillan <kmacmill@redhat.com> - 0.5.0-1
- Version bump for release and rpm name change - Version bump for release and rpm name change

View File

@@ -35,6 +35,9 @@ rm -rf %{buildroot}
%{_mandir}/man1/* %{_mandir}/man1/*
%changelog %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 * Wed Nov 21 2007 Karl MacMillan <kmacmill@redhat.com> - 0.5.0-1
- Version bump for release and rpm name change - Version bump for release and rpm name change

View File

@@ -1,6 +1,6 @@
AC_PREREQ(2.59) AC_PREREQ(2.59)
AC_INIT([ipa-client], AC_INIT([ipa-client],
[0.5.0], [0.6.0],
[https://hosted.fedoraproject.org/projects/freeipa/newticket]) [https://hosted.fedoraproject.org/projects/freeipa/newticket])
AC_CONFIG_SRCDIR([ipaclient/__init__.py]) AC_CONFIG_SRCDIR([ipaclient/__init__.py])

View File

@@ -1,5 +1,5 @@
Name: ipa-client Name: ipa-client
Version: 0.5.0 Version: 0.6.0
Release: 1%{?dist} Release: 1%{?dist}
Summary: IPA client Summary: IPA client
@@ -42,6 +42,9 @@ rm -rf %{buildroot}
%{_usr}/share/ipa/* %{_usr}/share/ipa/*
%changelog %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 * Wed Nov 21 2007 Karl MacMillan <kmacmill@redhat.com> - 0.5.0-1
- Version bump for release and rpm name change - Version bump for release and rpm name change

View File

@@ -42,6 +42,9 @@ rm -rf %{buildroot}
%{_usr}/share/ipa/* %{_usr}/share/ipa/*
%changelog %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 * Wed Nov 21 2007 Karl MacMillan <kmacmill@redhat.com> - 0.5.0-1
- Version bump for release and rpm name change - Version bump for release and rpm name change

View File

@@ -1,5 +1,5 @@
Name: ipa-python Name: ipa-python
Version: 0.5.0 Version: 0.6.0
Release: 1%{?dist} Release: 1%{?dist}
Summary: Ipa authentication server Summary: Ipa authentication server
@@ -35,6 +35,9 @@ rm -rf %{buildroot}
%config(noreplace) %{_sysconfdir}/ipa/ipa.conf %config(noreplace) %{_sysconfdir}/ipa/ipa.conf
%changelog %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 * Wed Nov 21 2007 Karl MacMillan <kmacmill@redhat.com> - 0.5.0-1
- Version bump for release and rename of rpm - Version bump for release and rename of rpm

View File

@@ -35,6 +35,9 @@ rm -rf %{buildroot}
%config(noreplace) %{_sysconfdir}/ipa/ipa.conf %config(noreplace) %{_sysconfdir}/ipa/ipa.conf
%changelog %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 * Wed Nov 21 2007 Karl MacMillan <kmacmill@redhat.com> - 0.5.0-1
- Version bump for release and rename of rpm - Version bump for release and rename of rpm

View File

@@ -35,10 +35,10 @@ def setup_package():
try: try:
setup( setup(
name = "ipa", name = "ipa",
version = "0.5.0", version = "0.6.0",
license = "GPL", license = "GPL",
author = "Karl MacMillan, et.al.", author = "Karl MacMillan, et.al.",
author_email = "kmacmillan@redhat.com", author_email = "kmacmill@redhat.com",
maintainer = "freeIPA Developers", maintainer = "freeIPA Developers",
maintainer_email = "freeipa-devel@redhat.com", maintainer_email = "freeipa-devel@redhat.com",
url = "http://www.freeipa.org/", url = "http://www.freeipa.org/",

View File

@@ -1,5 +1,5 @@
Name: ipa-radius-admintools Name: ipa-radius-admintools
Version: 0.5.0 Version: 0.6.0
Release: 1%{?dist} Release: 1%{?dist}
Summary: IPA authentication server - radius admin tools Summary: IPA authentication server - radius admin tools
@@ -34,5 +34,8 @@ rm -rf %{buildroot}
%{_sbindir}/ipa* %{_sbindir}/ipa*
%changelog %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 * Tue Dec 18 2007 Karl MacMillan <kmacmill@redhat.com> - 0.5.0
- Initial rpm version - Initial rpm version

View File

@@ -34,5 +34,8 @@ rm -rf %{buildroot}
%{_sbindir}/ipa* %{_sbindir}/ipa*
%changelog %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 * Tue Dec 18 2007 Karl MacMillan <kmacmill@redhat.com> - 0.5.0
- Initial rpm version - Initial rpm version

View File

@@ -1,5 +1,5 @@
Name: ipa-radius-server Name: ipa-radius-server
Version: 0.5.0 Version: 0.6.0
Release: 1%{?dist} Release: 1%{?dist}
Summary: IPA authentication server - radius plugin Summary: IPA authentication server - radius plugin
@@ -42,6 +42,9 @@ rm -rf %{buildroot}
%{_usr}/share/ipa/ipaserver/plugins/* %{_usr}/share/ipa/ipaserver/plugins/*
%changelog %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 * Wed Dec 12 2007 Karl MacMillan <kmacmill@redhat.com> - 0.5.0-1
- Initial version - Initial version

View File

@@ -42,6 +42,9 @@ rm -rf %{buildroot}
%{_usr}/share/ipa/ipaserver/plugins/* %{_usr}/share/ipa/ipaserver/plugins/*
%changelog %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 * Wed Dec 12 2007 Karl MacMillan <kmacmill@redhat.com> - 0.5.0-1
- Initial version - Initial version

View File

@@ -1,6 +1,6 @@
AC_PREREQ(2.59) AC_PREREQ(2.59)
AC_INIT([ipa-server], AC_INIT([ipa-server],
[0.5], [0.6.0],
[https://hosted.fedoraproject.org/projects/freeipa/newticket]) [https://hosted.fedoraproject.org/projects/freeipa/newticket])
AC_CONFIG_SRCDIR([ipaserver/ipaldap.py]) AC_CONFIG_SRCDIR([ipaserver/ipaldap.py])

View File

@@ -1,5 +1,5 @@
Name: ipa-server Name: ipa-server
Version: 0.5.0 Version: 0.6.0
Release: 1%{?dist} Release: 1%{?dist}
Summary: Ipa authentication server Summary: Ipa authentication server
@@ -109,6 +109,9 @@ fi
%changelog %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 * Wed Nov 21 2007 Karl MacMillan <kmacmill@mentalrootkit.com> - 0.5.0-1
- Preverse mode on ipa-keytab-util - Preverse mode on ipa-keytab-util
- Version bump for relase and rpm name change - Version bump for relase and rpm name change

View File

@@ -109,6 +109,9 @@ fi
%changelog %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 * Wed Nov 21 2007 Karl MacMillan <kmacmill@mentalrootkit.com> - 0.5.0-1
- Preverse mode on ipa-keytab-util - Preverse mode on ipa-keytab-util
- Version bump for relase and rpm name change - Version bump for relase and rpm name change