[Freeipa-devel] [PATCH 1 of 7] Fix ipa-python packaging

[Mark McLoughlin]

# HG changeset patch
# User Mark McLoughlin <markmc at redhat.com>
# Date 1197538288 0
# Node ID b8e1fbcf87d528c0c3b6d89d5306bea0bdb942c1
# Parent  13d59a930d719d396b6849d6b103467c75da1a68
Fix ipa-python packaging

Latest Fedora 9 python distutils generates .egg-info files;
follow the recommendation at:

  http://fedoraproject.org/wiki/Packaging/Python/Eggs

and just package everything under %{python_sitelib}/

Signed-off-by: Mark McLoughlin <markmc at redhat.com>

diff -r 13d59a930d71 -r b8e1fbcf87d5 ipa-python/ipa-python.spec
--- a/ipa-python/ipa-python.spec	Wed Dec 12 18:18:34 2007 -0500
+++ b/ipa-python/ipa-python.spec	Thu Dec 13 09:31:28 2007 +0000
@@ -13,8 +13,6 @@ Requires: PyKerberos
 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
 Ipa is a server for identity, policy, and audit.
@@ -33,8 +31,7 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%dir %{pkgpythondir}
-%{pkgpythondir}/*
+%{python_sitelib}/*
 %config(noreplace) %{_sysconfdir}/ipa/ipa.conf
 
 %changelog
diff -r 13d59a930d71 -r b8e1fbcf87d5 ipa-python/ipa-python.spec.in
--- a/ipa-python/ipa-python.spec.in	Wed Dec 12 18:18:34 2007 -0500
+++ b/ipa-python/ipa-python.spec.in	Thu Dec 13 09:31:28 2007 +0000
@@ -13,8 +13,6 @@ Requires: PyKerberos
 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
 Ipa is a server for identity, policy, and audit.
@@ -33,8 +31,7 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%dir %{pkgpythondir}
-%{pkgpythondir}/*
+%{python_sitelib}/*
 %config(noreplace) %{_sysconfdir}/ipa/ipa.conf
 
 %changelog
diff -r 13d59a930d71 -r b8e1fbcf87d5 ipa-python/setup.py
--- a/ipa-python/setup.py	Wed Dec 12 18:18:34 2007 -0500
+++ b/ipa-python/setup.py	Thu Dec 13 09:31:28 2007 +0000
@@ -34,7 +34,7 @@ def setup_package():
 
     try:
         setup(
-            name = "freeipa-python",
+            name = "ipa",
             version = "0.5.0",
             license = "GPL",
             author = "Karl MacMillan, et.al.",