summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Likins <alikins@redhat.com>2009-01-19 16:45:22 -0500
committerAdrian Likins <alikins@redhat.com>2009-01-19 16:45:22 -0500
commitcd13dd2c5c5e85461ac5b19aa48480d1ef80b94b (patch)
treed5008b06b6588d94ba2dee071573edceb0ec15b6
parent8b44578eb6d42cef58627b88e99fc394c5b66674 (diff)
downloadcertmaster-cd13dd2c5c5e85461ac5b19aa48480d1ef80b94b.zip
certmaster-cd13dd2c5c5e85461ac5b19aa48480d1ef80b94b.tar.gz
certmaster-cd13dd2c5c5e85461ac5b19aa48480d1ef80b94b.tar.xz
certmaster.spec: Try to simplify the support for rhel3+python2.3 a little bit.
We let distutils do the /usr/bin/python path munging for the files that need it (aka, everything in "scripts"). So we can get rid of the patch for this (we also cleaned up all the files that had a #! set that didn't need it) Some minor spec file formatting changes as well
-rw-r--r--certmaster.spec46
-rw-r--r--version2
2 files changed, 42 insertions, 6 deletions
diff --git a/certmaster.spec b/certmaster.spec
index afd2b6b..ced8847 100644
--- a/certmaster.spec
+++ b/certmaster.spec
@@ -1,8 +1,19 @@
+
+# We can run on Rhel 3'ish systems, but only if python2.3 is installed
+%if 0%{?rhel} == 3
+%define __python_ver 2.3
+%endif
+%define python python%{?__python_ver}
+%define __python /usr/bin/%{python}
+
+
+%{!?python_version: %define python_version %(%{__python} -c "from distutils.sysconfig import get_python_version; print get_python_version()")}
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%define is_suse %(test -e /etc/SuSE-release && echo 1 || echo 0)
+
Summary: Remote certificate distribution framework
Name: certmaster
Source1: version
@@ -11,21 +22,33 @@ Release: %(echo `awk '{ print $2 }' %{SOURCE1}`)%{?dist}
Source0: %{name}-%{version}.tar.gz
License: GPLv2+
Group: Applications/System
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildArch: noarch
+Url: https://fedorahosted.org/certmaster
+
+%if 0%{?rhel} == 3
+Requires: %{python}
+Requires: pyOpenSSL-py23
+%else
Requires: python >= 2.3
Requires: pyOpenSSL
-BuildRequires: python-devel
+%endif
+
+# NOTE: if you
+BuildRequires: %{python}-devel
%if %is_suse
BuildRequires: gettext-devel
%else
%if 0%{?fedora} >= 8
BuildRequires: python-setuptools-devel
%else
+%if 0%{?rhel} >= 5
BuildRequires: python-setuptools
%endif
%endif
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildArch: noarch
-Url: https://fedorahosted.org/certmaster
+%endif
+
+
%description
@@ -46,7 +69,7 @@ rm -fr $RPM_BUILD_ROOT
%files
%defattr(-, root, root, -)
-%if 0%{?fedora} > 8
+%if "%{python_version}" >= "2.5"
%{python_sitelib}/certmaster*.egg-info
%endif
%{_bindir}/certmaster
@@ -108,6 +131,19 @@ fi
%changelog
+* Mon Jan 19 2009 Adrian Likins <alikins@redhat.com> - 0.24.4
+- make inclusion of egginfo dependant on having python >= 2.5
+- remove need for patch on rhel3+python2.4 cases (distutils should
+ do all the /usr/bin/python renaming now)
+- minor reformatting changes
+
+* Tue Jan 06 2009 Greg Swift <gregswift@gmail.com> - 0.24-3
+- Fixed spec because it was only building in rhel3
+
+* Wed Dec 31 2008 Greg Swift <gregswift@gmail.com> - 0.24-2
+- Patched SPEC to build on rhel3 with python2.3
+- Added Patch0 to handle python2.3 if on rhel3
+
* Mon Dec 12 2008 Adrian Likins <alikins@redhat.com> - 0.24-1
- add missing dirs as per bz#473633
diff --git a/version b/version
index 4887ed5..be1ba6c 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.24 1
+0.24 4