summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2008-02-21 15:23:29 +0000
committerMark McLoughlin <markmc@redhat.com>2008-02-21 15:23:29 +0000
commit5ec9a552781ff707e72d397103d69eeb55e813f2 (patch)
tree29df1f63a5b53877ebbdc7befc525982d8bb3929
parentc317660a55c2a1907283d4017b6ce7094a58409e (diff)
downloadfreeipa-5ec9a552781ff707e72d397103d69eeb55e813f2.tar.gz
freeipa-5ec9a552781ff707e72d397103d69eeb55e813f2.tar.xz
freeipa-5ec9a552781ff707e72d397103d69eeb55e813f2.zip
Cleanup freeipa-python requires
We don't need the elaborate python requires, since a requires for e.g. "python-abi = 2.5" is automatically added. We also don't need the elaborate build requires, since all it does is query the currently installed version of python and require that you have it's appropriate python-devel installed. But if python-devel is installed at all, this should hold true. (Also, IMHO the .spec files should be removed from mercurial since they are automatically generated) Signed-off-by: Mark McLouglin <markmc@redhat.com>
-rwxr-xr-xipa-python/freeipa-python.spec5
-rwxr-xr-xipa-python/freeipa-python.spec.in5
2 files changed, 2 insertions, 8 deletions
diff --git a/ipa-python/freeipa-python.spec b/ipa-python/freeipa-python.spec
index da62eec8f..d6bd906d7 100755
--- a/ipa-python/freeipa-python.spec
+++ b/ipa-python/freeipa-python.spec
@@ -1,5 +1,3 @@
-%define pyver %(%{__python} -c 'import sys ; print sys.version[:3]')
-%define pynext %(%{__python} -c 'print %{pyver} + 0.1')
Name: freeipa-python
Version: 0.4.0
@@ -12,8 +10,7 @@ URL: http://www.freeipa.org
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}, python-devel <= 0:%{pyver}
-Requires: python >= 0:%{pyver}, python < 0:%{pynext}
+BuildRequires: python-devel
Requires: PyKerberos
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
diff --git a/ipa-python/freeipa-python.spec.in b/ipa-python/freeipa-python.spec.in
index b07b21fee..37eb23f00 100755
--- a/ipa-python/freeipa-python.spec.in
+++ b/ipa-python/freeipa-python.spec.in
@@ -1,5 +1,3 @@
-%define pyver %(%{__python} -c 'import sys ; print sys.version[:3]')
-%define pynext %(%{__python} -c 'print %{pyver} + 0.1')
Name: freeipa-python
Version: VERSION
@@ -12,8 +10,7 @@ URL: http://www.freeipa.org
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}, python-devel <= 0:%{pyver}
-Requires: python >= 0:%{pyver}, python < 0:%{pynext}
+BuildRequires: python-devel
Requires: PyKerberos
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}