Fix build issues by combining patches submitted by Michael Gregg and

  Karl MacMillan
Remove #!/usr/bin/python from many files to quiet rpmlint

9 files changed, 46 insertions, 38 deletions

diff --git a/ipa-python/Makefile b/ipa-python/Makefile
index 4b20d4bb7..b11a1f805 100644
--- a/ipa-python/Makefile
+++ b/ipa-python/Makefile
@@ -6,11 +6,10 @@ TESTS = $(wildcard test/*.py)
 all: ;
 
 install:
-	-mkdir -p $(PACKAGEDIR)
-	install -m 644 *.py $(PACKAGEDIR)
-	-mkdir -p $(CONFIGDIR)
-	if ! [ -e $(CONFIGDIR)/ipa.conf ]; then \
-		install -m 644 ipa.conf $(CONFIGDIR); \
+	if [ "$(DESTDIR)" = "" ]; then \
+		python setup.py install; \
+	else \
+		python setup.py install --root $(DESTDIR); \
 	fi
 
 clean:
diff --git a/ipa-python/freeipa-python.spec b/ipa-python/freeipa-python.spec
index 5a3985aa3..da62eec8f 100755
--- a/ipa-python/freeipa-python.spec
+++ b/ipa-python/freeipa-python.spec
@@ -3,19 +3,23 @@
 
 Name:           freeipa-python
 Version:        0.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        FreeIPA authentication server
 
 Group:          System Environment/Base
 License:        GPL
 URL:            http://www.freeipa.org
-Source0:        http://www.freeipa.org/downloads/%{name}-%{version}.tar.gz
+Source0:        http://www.freeipa.org/downloads/%{name}-%{version}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: 	noarch
-BuildRequires: python >= 0:%{pyver}, python < 0:%{pynext}
+BuildRequires: python >= 0:%{pyver}, python < 0:%{pynext}, python-devel <= 0:%{pyver}
 Requires: python >= 0:%{pyver}, python < 0:%{pynext}
 Requires: PyKerberos
 
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
+%define pkgpythondir  %{python_sitelib}/ipa
+
 %description
 FreeIPA is a server for identity, policy, and audit.
 
@@ -23,24 +27,30 @@ FreeIPA is a server for identity, policy, and audit.
 %setup -q
 
 %build
-%{__python} setup.py build
 
 %install
 rm -rf %{buildroot}
-%{__python} setup.py install -O1 --root=%{buildroot} --record=INSTALLED_FILES
-sed 's|^\(.*\.pyo\)$|%ghost \1|' < INSTALLED_FILES > %{name}-%{version}.files
-find $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages/* -type d \
-  | sed "s|^$RPM_BUILD_ROOT|%dir |" >> %{name}-%{version}.files
+%{__python} setup.py install --no-compile --root=%{buildroot}
 
 %clean
 rm -rf %{buildroot}
 
-%files -f %{name}-%{version}.files
+%files
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/ipa.conf
-
+%dir %{pkgpythondir}
+%{pkgpythondir}/*
+%config(noreplace) %{_sysconfdir}/ipa/ipa.conf
 
 %changelog
+* Wed Oct 17 2007 Rob Crittenden <rcritten@redhat.com> - 0.4.0-2
+- Use new python setup.py build script
+
+* Tue Oct  2 2007 Karl MacMillan <kmacmill@redhat.com> - 0.4.0-1
+- Milestone 4
+
+* Mon Sep 10 2007 Karl MacMillan <kmacmill@redhat.com> - 0.3.0-1
+- Milestone 3
+
 * Fri Aug 17 2007 Karl MacMillan <kmacmill@redhat.com> = 0.2.0-4
 - Added PyKerberos dep.
 
@@ -53,5 +63,3 @@ rm -rf %{buildroot}
 
 * Fri Jul 27 2007 Karl MacMillan <kmacmill@localhost.localdomain> - 0.1.0-1
 - Initial rpm version
-
-
diff --git a/ipa-python/freeipa-python.spec.in b/ipa-python/freeipa-python.spec.in
index ed78ec0cc..b07b21fee 100755
--- a/ipa-python/freeipa-python.spec.in
+++ b/ipa-python/freeipa-python.spec.in
@@ -3,19 +3,23 @@
 
 Name:           freeipa-python
 Version:        VERSION
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        FreeIPA authentication server
 
 Group:          System Environment/Base
 License:        GPL
 URL:            http://www.freeipa.org
-Source0:        http://www.freeipa.org/downloads/%{name}-%{version}.tar.gz
+Source0:        http://www.freeipa.org/downloads/%{name}-%{version}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: 	noarch
-BuildRequires: python >= 0:%{pyver}, python < 0:%{pynext}
+BuildRequires: python >= 0:%{pyver}, python < 0:%{pynext}, python-devel <= 0:%{pyver}
 Requires: python >= 0:%{pyver}, python < 0:%{pynext}
 Requires: PyKerberos
 
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
+%define pkgpythondir  %{python_sitelib}/ipa
+
 %description
 FreeIPA is a server for identity, policy, and audit.
 
@@ -23,24 +27,30 @@ FreeIPA is a server for identity, policy, and audit.
 %setup -q
 
 %build
-%{__python} setup.py build
 
 %install
 rm -rf %{buildroot}
-%{__python} setup.py install -O1 --root=%{buildroot} --record=INSTALLED_FILES
-sed 's|^\(.*\.pyo\)$|%ghost \1|' < INSTALLED_FILES > %{name}-%{version}.files
-find $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages/* -type d \
-  | sed "s|^$RPM_BUILD_ROOT|%dir |" >> %{name}-%{version}.files
+%{__python} setup.py install --no-compile --root=%{buildroot}
 
 %clean
 rm -rf %{buildroot}
 
-%files -f %{name}-%{version}.files
+%files
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/ipa.conf
-
+%dir %{pkgpythondir}
+%{pkgpythondir}/*
+%config(noreplace) %{_sysconfdir}/ipa/ipa.conf
 
 %changelog
+* Wed Oct 17 2007 Rob Crittenden <rcritten@redhat.com> - 0.4.0-2
+- Use new python setup.py build script
+
+* Tue Oct  2 2007 Karl MacMillan <kmacmill@redhat.com> - 0.4.0-1
+- Milestone 4
+
+* Mon Sep 10 2007 Karl MacMillan <kmacmill@redhat.com> - 0.3.0-1
+- Milestone 3
+
 * Fri Aug 17 2007 Karl MacMillan <kmacmill@redhat.com> = 0.2.0-4
 - Added PyKerberos dep.
 
@@ -53,5 +63,3 @@ rm -rf %{buildroot}
 
 * Fri Jul 27 2007 Karl MacMillan <kmacmill@localhost.localdomain> - 0.1.0-1
 - Initial rpm version
-
-
diff --git a/ipa-python/ipaclient.py b/ipa-python/ipaclient.py
index 9f6f8f3e6..63cd425f2 100644
--- a/ipa-python/ipaclient.py
+++ b/ipa-python/ipaclient.py
@@ -1,4 +1,3 @@
-#! /usr/bin/python -E
 # Authors: Rob Crittenden <rcritten@redhat.com>
 #
 # Copyright (C) 2007    Red Hat
diff --git a/ipa-python/ipaerror.py b/ipa-python/ipaerror.py
index 9e9a74140..0106132ca 100644
--- a/ipa-python/ipaerror.py
+++ b/ipa-python/ipaerror.py
@@ -1,5 +1,3 @@
-#! /usr/bin/python -E
-#
 # Copyright (C) 2007    Red Hat
 # see file 'COPYING' for use and warranty information
 #
diff --git a/ipa-python/ipautil.py b/ipa-python/ipautil.py
index 38b941aa0..1979ceb45 100644
--- a/ipa-python/ipautil.py
+++ b/ipa-python/ipautil.py
@@ -1,4 +1,3 @@
-#! /usr/bin/python -E
 # Authors: Simo Sorce <ssorce@redhat.com>
 #
 # Copyright (C) 2007    Red Hat
diff --git a/ipa-python/ipavalidate.py b/ipa-python/ipavalidate.py
index aa09f5836..918c34a62 100644
--- a/ipa-python/ipavalidate.py
+++ b/ipa-python/ipavalidate.py
@@ -1,4 +1,3 @@
-#! /usr/bin/python -E
 # Authors: Rob Crittenden <rcritten@redhat.com>
 #
 # Copyright (C) 2007  Red Hat
diff --git a/ipa-python/krbtransport.py b/ipa-python/krbtransport.py
index dbb8ec34e..ff2671d0e 100644
--- a/ipa-python/krbtransport.py
+++ b/ipa-python/krbtransport.py
@@ -1,4 +1,3 @@
-#! /usr/bin/python -E
 # Authors: Rob Crittenden <rcritten@redhat.com>
 #
 # Copyright (C) 2007  Red Hat
diff --git a/ipa-python/rpcclient.py b/ipa-python/rpcclient.py
index eae68ee32..c18405ad3 100644
--- a/ipa-python/rpcclient.py
+++ b/ipa-python/rpcclient.py
@@ -1,4 +1,3 @@
-#! /usr/bin/python -E
 # Authors: Rob Crittenden <rcritten@redhat.com>
 #
 # Copyright (C) 2007  Red Hat