Re: patch to spec/version and path0 to allow certmaster to build in rhel3 FIXED

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Tue, Jan 6, 2009 at 14:46, Greg Swift <gregswift@xxxxxxxxx> wrote:
The first patch makes changes to the spec for building against a custom python2.3 when in a rhel3 environment.  When in that environment it will use the certmaster-python2.3.patch to adjust all the python script's headers to point to the right binary.

original spec file patch builds fine on rhel3, broke on rhel5 and fedora.  fixed.  new attachment ignore last patch and is against git trunk.  certmaster-python2.3.patch from original is still corrent.



diff --git a/certmaster.spec b/certmaster.spec
index afd2b6b..e43206e 100644
--- a/certmaster.spec
+++ b/certmaster.spec
@@ -1,3 +1,8 @@
+%if 0%{?rhel} == 3
+%define __python_ver 2.3
+%endif
+%define python python%{?__python_ver}
+%define __python /usr/bin/%{python}
 
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
@@ -9,20 +14,30 @@ Source1: version
 Version: %(echo `awk '{ print $1 }' %{SOURCE1}`)
 Release: %(echo `awk '{ print $2 }' %{SOURCE1}`)%{?dist}
 Source0: %{name}-%{version}.tar.gz
+%if 0%{?rhel} == 3
+Patch0: %{name}-%{python}.patch
+%endif
 License: GPLv2+
 Group: Applications/System
+%if 0%{?rhel} == 3
+Requires: %{python}
+Requires: pyOpenSSL-py23
+%else
 Requires: python >= 2.3
 Requires: pyOpenSSL
-BuildRequires: python-devel
+%endif
+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
+%endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
 Url: https://fedorahosted.org/certmaster
@@ -33,6 +48,9 @@ certmaster is a easy mechanism for distributing SSL certificates
 
 %prep
 %setup -q
+%if 0%{?rhel} == 3
+%patch0 -p1
+%endif
 
 %build
 %{__python} setup.py build
@@ -108,6 +126,13 @@ fi
 
 
 %changelog
+* Tue Jan 06 Greg Swift <gregswift@xxxxxxxxx> - 0.24-3
+- Fixed spec because it was only building in rhel3
+
+* Wed Dec 31 2008 Greg Swift <gregswift@xxxxxxxxx> - 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@xxxxxxxxxx> - 0.24-1
 - add missing dirs as per bz#473633
 
diff --git a/version b/version
index 4887ed5..8893a2c 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.24 1 
+0.24 3
_______________________________________________
Func-list mailing list
Func-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/func-list

[Index of Archives]     [Fedora Users]     [Linux Networking]     [Fedora Legacy List]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]

  Powered by Linux