From 042fb11fa107718a831d468d16188e02f6ae3712 Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Fri, 18 Jan 2008 16:20:36 -0500 Subject: 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 --- ipa-radius-server/Makefile | 4 ++-- ipa-radius-server/ipa-radius-install | 1 - ipa-radius-server/ipa-radius-server.spec | 11 +++++------ ipa-radius-server/ipa-radius-server.spec.in | 13 ++++++------- ipa-radius-server/plugins/radiusinstance.py | 4 ---- 5 files changed, 13 insertions(+), 20 deletions(-) (limited to 'ipa-radius-server') diff --git a/ipa-radius-server/Makefile b/ipa-radius-server/Makefile index 7de51b469..fa73de97c 100644 --- a/ipa-radius-server/Makefile +++ b/ipa-radius-server/Makefile @@ -7,7 +7,7 @@ all: install: -mkdir -p $(PLUGINS_SHARE) -mkdir -p $(PLUGINS_PYTHON) - -mkdir -p $(PLUGINS_SBINDIR) + -mkdir -p $(SBINDIR) install -m 644 plugins/*.py $(PLUGINS_PYTHON) install -m 644 share/*.template $(PLUGINS_SHARE) install -m 755 ipa-radius-install $(SBINDIR) @@ -17,4 +17,4 @@ clean: distclean: clean -test: \ No newline at end of file +test: diff --git a/ipa-radius-server/ipa-radius-install b/ipa-radius-server/ipa-radius-install index 3e759d8d2..8ed3aabb6 100644 --- a/ipa-radius-server/ipa-radius-install +++ b/ipa-radius-server/ipa-radius-install @@ -19,7 +19,6 @@ # import sys -sys.path.append("/usr/share/ipa") import traceback, logging, krbV diff --git a/ipa-radius-server/ipa-radius-server.spec b/ipa-radius-server/ipa-radius-server.spec index 4c533fda3..6ce2abe88 100755 --- a/ipa-radius-server/ipa-radius-server.spec +++ b/ipa-radius-server/ipa-radius-server.spec @@ -1,10 +1,10 @@ Name: ipa-radius-server Version: 0.6.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: IPA authentication server - radius plugin 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) @@ -42,12 +42,11 @@ rm -rf %{buildroot} %{_usr}/share/ipa/ipaserver/plugins/* %changelog +* 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 Dec 12 2007 Karl MacMillan - 0.5.0-1 - Initial version - - - - diff --git a/ipa-radius-server/ipa-radius-server.spec.in b/ipa-radius-server/ipa-radius-server.spec.in index f6569b691..02d6328ee 100755 --- a/ipa-radius-server/ipa-radius-server.spec.in +++ b/ipa-radius-server/ipa-radius-server.spec.in @@ -1,10 +1,10 @@ Name: ipa-radius-server Version: VERSION -Release: 1%{?dist} +Release: 2%{?dist} Summary: IPA authentication server - radius plugin 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) @@ -42,12 +42,11 @@ rm -rf %{buildroot} %{_usr}/share/ipa/ipaserver/plugins/* %changelog -* Fri Dec 21 2007 Karl MacMillan - VERSION-1 +* 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 Dec 12 2007 Karl MacMillan - 0.5.0-1 - Initial version - - - - diff --git a/ipa-radius-server/plugins/radiusinstance.py b/ipa-radius-server/plugins/radiusinstance.py index 731cd65a1..2048788a4 100644 --- a/ipa-radius-server/plugins/radiusinstance.py +++ b/ipa-radius-server/plugins/radiusinstance.py @@ -1,4 +1,3 @@ -#! /usr/bin/python -E # Authors: John Dennis # # Copyright (C) 2007 Red Hat @@ -18,9 +17,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -import sys -sys.path.append("/usr/share/ipa") - import subprocess import string import tempfile -- cgit