Fix issues reported by rpmlint.

- Removing shebangs (#!) from a bunch of python libraries
- Don't use a variable name in init scripts for the lock file
- Keep the init script name consistent with the binary name, so renamed
  ipa-kpasswd.init to ipa_kpasswd.init
- Add status option to the init scripts
- Move most python scripts out of /usr/share/ipa and into the python
  site-packages directories (ipaserver and ipaclient)
- Remove unnecessary sys.path.append("/usr/share/ipa")
- Fix the license string in the spec files
- Rename ipa-webgui to ipa_webgui everywhere
- Fix a couple of issues reported by pychecker in ipa-python

6 files changed, 23 insertions, 8 deletions

diff --git a/ipa-client/ipa-client.spec b/ipa-client/ipa-client.spec
index 55d0970d6..f6e7525d8 100755
--- a/ipa-client/ipa-client.spec
+++ b/ipa-client/ipa-client.spec
@@ -1,16 +1,18 @@
 Name:           ipa-client
 Version:        0.6.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        IPA client
 
 Group:          System Environment/Base
-License:        GPL
+License:        GPLv2+
 URL:            http://www.freeipa.org
 Source0:        %{name}-%{version}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: python python-ldap python-krbV ipa-python cyrus-sasl-gssapi
 
+%{!?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.
 The client package provide install and configuration scripts for clients.
@@ -41,7 +43,14 @@ rm -rf %{buildroot}
 %dir %{_usr}/share/ipa
 %{_usr}/share/ipa/*
 
+%dir %{python_sitelib}/ipaclient
+%{python_sitelib}/ipaclient/*.py*
+
 %changelog
+* Thu Jan 17 2008 Rob Crittenden <rcritten@redhat.com> = 0.6.0-2
+- Fixed License in specfile
+- Move client python files to /usr/lib*/python*/site-packages
+
 * Fri Dec 21 2007 Karl MacMillan <kmacmill@redhat.com> - 0.6.0-1
 - Version bump for release
 
diff --git a/ipa-client/ipa-client.spec.in b/ipa-client/ipa-client.spec.in
index c3c7c07c7..f69ba6b39 100644
--- a/ipa-client/ipa-client.spec.in
+++ b/ipa-client/ipa-client.spec.in
@@ -1,16 +1,18 @@
 Name:           ipa-client
 Version:        VERSION
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        IPA client
 
 Group:          System Environment/Base
-License:        GPL
+License:        GPLv2+
 URL:            http://www.freeipa.org
 Source0:        %{name}-%{version}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: python python-ldap python-krbV ipa-python cyrus-sasl-gssapi
 
+%{!?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.
 The client package provide install and configuration scripts for clients.
@@ -41,7 +43,14 @@ rm -rf %{buildroot}
 %dir %{_usr}/share/ipa
 %{_usr}/share/ipa/*
 
+%dir %{python_sitelib}/ipaclient
+%{python_sitelib}/ipaclient/*.py*
+
 %changelog
+* Thu Jan 17 2008 Rob Crittenden <rcritten@redhat.com> = 0.6.0-2
+- Fixed License in specfile
+- Move client python files to /usr/lib*/python*/site-packages
+
 * Fri Dec 21 2007 Karl MacMillan <kmacmill@redhat.com> - 0.6.0-1
 - Version bump for release
 
diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install
index e499f0e40..fda5a9006 100644
--- a/ipa-client/ipa-install/ipa-client-install
+++ b/ipa-client/ipa-install/ipa-client-install
@@ -22,7 +22,6 @@
 VERSION = "%prog .1"
 
 import sys
-sys.path.append("/usr/share/ipa")
 
 import krbV
 import socket
diff --git a/ipa-client/ipaclient/Makefile.am b/ipa-client/ipaclient/Makefile.am
index 290ffef8d..1d7df5266 100644
--- a/ipa-client/ipaclient/Makefile.am
+++ b/ipa-client/ipaclient/Makefile.am
@@ -1,6 +1,6 @@
 NULL =
 
-appdir = $(IPA_DATA_DIR)/ipaclient
+appdir = $(pythondir)/ipaclient
 app_PYTHON = 			\
 	__init__.py		\
 	ipachangeconf.py	\
diff --git a/ipa-client/ipaclient/__init__.py b/ipa-client/ipaclient/__init__.py
index ba14d3c4c..3eabc0f37 100644
--- a/ipa-client/ipaclient/__init__.py
+++ b/ipa-client/ipaclient/__init__.py
@@ -1,4 +1,3 @@
-#! /usr/bin/python -E
 # Authors: Simo Sorce <ssorce@redhat.com>
 #
 # Copyright (C) 2007  Red Hat
diff --git a/ipa-client/ipaclient/ipadiscovery.py b/ipa-client/ipaclient/ipadiscovery.py
index 939d41056..c3a1fc7d6 100644
--- a/ipa-client/ipaclient/ipadiscovery.py
+++ b/ipa-client/ipaclient/ipadiscovery.py
@@ -1,4 +1,3 @@
-#! /usr/bin/python -E
 # Authors: Simo Sorce <ssorce@redhat.com>
 #
 # Copyright (C) 2007  Red Hat