From 5ad2af3429580bc45bdfb7de53601ddf615266bf Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Wed, 30 Apr 2008 17:49:52 -0400 Subject: Redo the way versioning works in freeIPA. The file VERSION is now the sole-source of versioning. The generated .spec files will been removed in the maintainer-clean targets and have been removed from the repository. By default a GIT build is done. To do a non-GIT build do: $ make TARGET IPA_VERSION_IS_GIT_SNAPSHOT=no When updating the version you can run this to regenerate the version: $ make version-update The version can be determined in Python by using ipaserver.version.VERSION --- ipa-python/ipa-python.spec | 82 ---------------------------------------------- ipa-python/setup.py | 77 ------------------------------------------- ipa-python/setup.py.in | 77 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 77 insertions(+), 159 deletions(-) delete mode 100755 ipa-python/ipa-python.spec delete mode 100644 ipa-python/setup.py create mode 100644 ipa-python/setup.py.in (limited to 'ipa-python') diff --git a/ipa-python/ipa-python.spec b/ipa-python/ipa-python.spec deleted file mode 100755 index dd7f0af2..00000000 --- a/ipa-python/ipa-python.spec +++ /dev/null @@ -1,82 +0,0 @@ -Name: ipa-python -Version: 1.0.0 -Release: 1%{?dist} -Summary: IPA authentication server - -Group: System Environment/Base -License: GPLv2 -URL: http://www.freeipa.org -Source0: http://www.freeipa.org/downloads/%{name}-%{version}.tgz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch -BuildRequires: python-devel -Requires: python-kerberos - -%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} - -%description -IPA is a server for identity, policy, and audit. - -%prep -%setup -q - -%build - -%install -rm -rf %{buildroot} -%{__python} setup.py install --no-compile --root=%{buildroot} - -%clean -rm -rf %{buildroot} - -%files -%defattr(-,root,root,-) -%{python_sitelib}/* -%config(noreplace) %{_sysconfdir}/ipa/ipa.conf - -%changelog -* Thu Apr 3 2008 Rob Crittenden - 1.0.0-1 -- Version bump for release - -* Thu Feb 21 2008 Rob Crittenden - 0.99.0-1 -- Version bump for release - -* Thu Jan 31 2008 Rob Crittenden - 0.6.0-4 -- Marked with wrong license. IPA is GPLv2. - -* Thu Jan 24 2008 Rob Crittenden - 0.6.0-3 -- Use new name of PyKerberos, python-kerberos, in Requires - -* Thu Jan 17 2008 Rob Crittenden - 0.6.0-2 -- Fixed License in specfile - -* Fri Dec 21 2007 Karl MacMillan - 0.6.0-1 -- Version bump for release - -* Wed Nov 21 2007 Karl MacMillan - 0.5.0-1 -- Version bump for release and rename of rpm - -* Thu Nov 1 2007 Karl MacMillan - 0.4.1-1 -- Version bump for release - -* Wed Oct 17 2007 Rob Crittenden - 0.4.0-2 -- Use new python setup.py build script - -* Tue Oct 2 2007 Karl MacMillan - 0.4.0-1 -- Milestone 4 - -* Mon Sep 10 2007 Karl MacMillan - 0.3.0-1 -- Milestone 3 - -* Fri Aug 17 2007 Karl MacMillan = 0.2.0-4 -- Added PyKerberos dep. - -* Mon Aug 5 2007 Rob Crittenden - 0.1.0-3 -- Abstracted client class to work directly or over RPC - -* Wed Aug 1 2007 Rob Crittenden - 0.1.0-2 -- Add User class -- Add kerberos authentication to the XML-RPC request made from tools. - -* Fri Jul 27 2007 Karl MacMillan - 0.1.0-1 -- Initial rpm version diff --git a/ipa-python/setup.py b/ipa-python/setup.py deleted file mode 100644 index a48b8e69..00000000 --- a/ipa-python/setup.py +++ /dev/null @@ -1,77 +0,0 @@ -#!/usr/bin/env python -# Copyright (C) 2007 Red Hat -# see file 'COPYING' for use and warranty information -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; version 2 only -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# - -"""FreeIPA python support library - -FreeIPA is a server for identity, policy, and audit. -""" - -DOCLINES = __doc__.split("\n") - -import os -import sys -import distutils.sysconfig - -CLASSIFIERS = """\ -Development Status :: 4 - Beta -Intended Audience :: System Environment/Base -License :: GPL -Programming Language :: Python -Operating System :: POSIX -Operating System :: Unix -""" - -# BEFORE importing distutils, remove MANIFEST. distutils doesn't properly -# update it when the contents of directories change. -if os.path.exists('MANIFEST'): os.remove('MANIFEST') - -def setup_package(): - - from distutils.core import setup - - old_path = os.getcwd() - local_path = os.path.dirname(os.path.abspath(sys.argv[0])) - os.chdir(local_path) - sys.path.insert(0,local_path) - - try: - setup( - name = "ipa", - version = "0.6.0", - license = "GPL", - author = "Karl MacMillan, et.al.", - author_email = "kmacmill@redhat.com", - maintainer = "freeIPA Developers", - maintainer_email = "freeipa-devel@redhat.com", - url = "http://www.freeipa.org/", - description = DOCLINES[0], - long_description = "\n".join(DOCLINES[2:]), - download_url = "http://www.freeipa.org/page/Downloads", - classifiers=filter(None, CLASSIFIERS.split('\n')), - platforms = ["Linux", "Solaris", "Unix"], - package_dir = {'ipa': ''}, - packages = [ "ipa" ], - data_files = [('/etc/ipa', ['ipa.conf'])] - ) - finally: - del sys.path[0] - os.chdir(old_path) - return - -if __name__ == '__main__': - setup_package() diff --git a/ipa-python/setup.py.in b/ipa-python/setup.py.in new file mode 100644 index 00000000..a48b8e69 --- /dev/null +++ b/ipa-python/setup.py.in @@ -0,0 +1,77 @@ +#!/usr/bin/env python +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; version 2 only +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# + +"""FreeIPA python support library + +FreeIPA is a server for identity, policy, and audit. +""" + +DOCLINES = __doc__.split("\n") + +import os +import sys +import distutils.sysconfig + +CLASSIFIERS = """\ +Development Status :: 4 - Beta +Intended Audience :: System Environment/Base +License :: GPL +Programming Language :: Python +Operating System :: POSIX +Operating System :: Unix +""" + +# BEFORE importing distutils, remove MANIFEST. distutils doesn't properly +# update it when the contents of directories change. +if os.path.exists('MANIFEST'): os.remove('MANIFEST') + +def setup_package(): + + from distutils.core import setup + + old_path = os.getcwd() + local_path = os.path.dirname(os.path.abspath(sys.argv[0])) + os.chdir(local_path) + sys.path.insert(0,local_path) + + try: + setup( + name = "ipa", + version = "0.6.0", + license = "GPL", + author = "Karl MacMillan, et.al.", + author_email = "kmacmill@redhat.com", + maintainer = "freeIPA Developers", + maintainer_email = "freeipa-devel@redhat.com", + url = "http://www.freeipa.org/", + description = DOCLINES[0], + long_description = "\n".join(DOCLINES[2:]), + download_url = "http://www.freeipa.org/page/Downloads", + classifiers=filter(None, CLASSIFIERS.split('\n')), + platforms = ["Linux", "Solaris", "Unix"], + package_dir = {'ipa': ''}, + packages = [ "ipa" ], + data_files = [('/etc/ipa', ['ipa.conf'])] + ) + finally: + del sys.path[0] + os.chdir(old_path) + return + +if __name__ == '__main__': + setup_package() -- cgit