summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2007-12-13 09:31:28 +0000
committerMark McLoughlin <markmc@redhat.com>2007-12-13 09:31:28 +0000
commit2dd8c346f34f361c19166c5033a2af8c1367159b (patch)
tree043a0e5d8cc6c72ebed336a76c1ce88bafbcd388
parentb3c39632ea59b6a4ea063571038111db3db1cd30 (diff)
downloadfreeipa-2dd8c346f34f361c19166c5033a2af8c1367159b.tar.gz
freeipa-2dd8c346f34f361c19166c5033a2af8c1367159b.tar.xz
freeipa-2dd8c346f34f361c19166c5033a2af8c1367159b.zip
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@redhat.com>
-rwxr-xr-xipa-python/ipa-python.spec5
-rwxr-xr-xipa-python/ipa-python.spec.in5
-rw-r--r--ipa-python/setup.py2
3 files changed, 3 insertions, 9 deletions
diff --git a/ipa-python/ipa-python.spec b/ipa-python/ipa-python.spec
index 2837a2832..1c838821b 100755
--- a/ipa-python/ipa-python.spec
+++ b/ipa-python/ipa-python.spec
@@ -14,8 +14,6 @@ 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 --git a/ipa-python/ipa-python.spec.in b/ipa-python/ipa-python.spec.in
index bd8ac0da6..9eb2e11c2 100755
--- a/ipa-python/ipa-python.spec.in
+++ b/ipa-python/ipa-python.spec.in
@@ -14,8 +14,6 @@ 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 --git a/ipa-python/setup.py b/ipa-python/setup.py
index 3a5a6f4eb..deb84f293 100644
--- a/ipa-python/setup.py
+++ b/ipa-python/setup.py
@@ -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.",