rhel3 spec file patches for func and certmaster FINAL

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

 

its just one of those days man... one of those days.

please ignore the last sets of e-mails.  attached to this e-mail are the patches for both the func and certmaster spec and version files, as well as a patch file for each package that is only called when rhel3 is in play.  I just tested these on f8, rhel3, and rhel5.  all 3 build.

sorry for the noise.
diff --git a/certmaster.spec b/certmaster.spec
index afd2b6b..c9ffc25 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 2009 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

diff --git a/func.spec b/func.spec
index 396eb7a..0a31dcc 100644
--- a/func.spec
+++ b/func.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,23 +14,33 @@ 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
-Requires: python-simplejson
-Requires: certmaster >= 0.24
+%endif
+Requires: %{python}-simplejson
+Requires: certmaster >= %{version}
 Requires: logrotate
-BuildRequires: python-devel
+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/func/
@@ -35,6 +50,9 @@ func is a remote api for mangement, configuration, and monitoring of systems.
 
 %prep
 %setup -q
+%if 0%{?rhel} == 3
+%patch0 -p1
+%endif
 
 %build
 %{__python} setup.py build
@@ -135,6 +153,13 @@ fi
 
 
 %changelog
+* Tue Jan 06 2009 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
+
 * Wed Dec 17 2008 Adrian Likins <alikins@xxxxxxxxxx> - 0.24-1
 - require certmaster 0.24 
 
diff --git a/version b/version
index 14e8220..8893a2c 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.24 1
+0.24 3

diff -uNr certmaster-0.24.orig/scripts/certmaster certmaster-0.24/scripts/certmaster
--- certmaster-0.24.orig/scripts/certmaster	2008-09-19 13:45:36.000000000 -0500
+++ certmaster-0.24/scripts/certmaster	2008-12-31 11:30:55.000000000 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.3
 
 from certmaster import certmaster
 
diff -uNr certmaster-0.24.orig/scripts/certmaster-ca certmaster-0.24/scripts/certmaster-ca
--- certmaster-0.24.orig/scripts/certmaster-ca	2008-09-19 13:45:36.000000000 -0500
+++ certmaster-0.24/scripts/certmaster-ca	2008-12-31 11:31:01.000000000 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/python -tt
+#!/usr/bin/python2.3 -tt
 # sign/list keys
 # --sign hostname hostname hostname
 # --list # lists all csrs needing to be signed
diff -uNr certmaster-0.24.orig/scripts/certmaster-request certmaster-0.24/scripts/certmaster-request
--- certmaster-0.24.orig/scripts/certmaster-request	2008-09-19 13:45:36.000000000 -0500
+++ certmaster-0.24/scripts/certmaster-request	2008-12-31 11:30:57.000000000 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.3
 
 """
 Application to request a cert from a certmaster.
diff -uNr certmaster-0.24.orig/setup.py certmaster-0.24/setup.py
--- certmaster-0.24.orig/setup.py	2008-09-19 13:45:36.000000000 -0500
+++ certmaster-0.24/setup.py	2008-12-31 11:31:12.000000000 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.3
 
 from distutils.core import setup
 #from setuptools import setup,find_packages

diff -uNr func-0.24.orig/func/codes.py func-0.24/func/codes.py
--- func-0.24.orig/func/codes.py	2008-11-16 19:39:58.000000000 -0600
+++ func-0.24/func/codes.py	2008-12-31 11:21:40.000000000 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.3
 """
 func
 
diff -uNr func-0.24.orig/func/commonconfig.py func-0.24/func/commonconfig.py
--- func-0.24.orig/func/commonconfig.py	2008-11-16 19:39:58.000000000 -0600
+++ func-0.24/func/commonconfig.py	2008-12-31 11:22:02.000000000 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.3
 """
 func
 
diff -uNr func-0.24.orig/func/minion/modules/bridge.py func-0.24/func/minion/modules/bridge.py
--- func-0.24.orig/func/minion/modules/bridge.py	2008-11-16 19:39:58.000000000 -0600
+++ func-0.24/func/minion/modules/bridge.py	2008-12-31 11:21:45.000000000 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.3
 #
 # Copyright 2008, Stone-IT
 # Jasper Capel <capel@xxxxxxxxxxxx>
diff -uNr func-0.24.orig/func/minion/modules/func_getargs.py func-0.24/func/minion/modules/func_getargs.py
--- func-0.24.orig/func/minion/modules/func_getargs.py	2008-11-16 19:39:58.000000000 -0600
+++ func-0.24/func/minion/modules/func_getargs.py	2008-12-31 11:21:43.000000000 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.3
 
 #
 # Copyright 2008
diff -uNr func-0.24.orig/func/minion/modules/vlan.py func-0.24/func/minion/modules/vlan.py
--- func-0.24.orig/func/minion/modules/vlan.py	2008-11-16 19:39:58.000000000 -0600
+++ func-0.24/func/minion/modules/vlan.py	2008-12-31 11:21:47.000000000 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.3
 #
 # Copyright 2008, Stone-IT
 # Jasper Capel <capel@xxxxxxxxxxxx>
diff -uNr func-0.24.orig/func/overlord/base_command.py func-0.24/func/overlord/base_command.py
--- func-0.24.orig/func/overlord/base_command.py	2008-11-16 19:39:58.000000000 -0600
+++ func-0.24/func/overlord/base_command.py	2008-12-31 11:22:00.000000000 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.3
 """
 Copyright 2008, Red Hat, Inc
 Adrian Likins <alikins@xxxxxxxxxx>
diff -uNr func-0.24.orig/func/overlord/func_command.py func-0.24/func/overlord/func_command.py
--- func-0.24.orig/func/overlord/func_command.py	2008-11-16 19:39:58.000000000 -0600
+++ func-0.24/func/overlord/func_command.py	2008-12-31 11:21:58.000000000 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.3
 
 ## func command line interface & client lib
 ##
diff -uNr func-0.24.orig/func/overlord/groups.py func-0.24/func/overlord/groups.py
--- func-0.24.orig/func/overlord/groups.py	2008-11-16 19:39:58.000000000 -0600
+++ func-0.24/func/overlord/groups.py	2008-12-31 11:21:49.000000000 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.3
 
 ## func command line interface & client lib
 ##
diff -uNr func-0.24.orig/func/overlord/test_func.py func-0.24/func/overlord/test_func.py
--- func-0.24.orig/func/overlord/test_func.py	2008-07-29 14:44:24.000000000 -0500
+++ func-0.24/func/overlord/test_func.py	2008-12-31 11:21:55.000000000 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.3
 
 
 # FIXME: should import the client lib, not XMLRPC lib, when we are done
diff -uNr func-0.24.orig/scripts/func func-0.24/scripts/func
--- func-0.24.orig/scripts/func	2008-07-29 14:44:39.000000000 -0500
+++ func-0.24/scripts/func	2008-12-31 11:22:23.000000000 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.3
 
 ##
 ## Copyright 2007-2008, Red Hat Inc
diff -uNr func-0.24.orig/scripts/func-build-map func-0.24/scripts/func-build-map
--- func-0.24.orig/scripts/func-build-map	2008-07-29 14:44:39.000000000 -0500
+++ func-0.24/scripts/func-build-map	2008-12-31 11:22:27.000000000 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.3
 
 import sys
 import distutils.sysconfig
diff -uNr func-0.24.orig/scripts/func-create-module func-0.24/scripts/func-create-module
--- func-0.24.orig/scripts/func-create-module	2008-07-29 14:44:39.000000000 -0500
+++ func-0.24/scripts/func-create-module	2008-12-31 11:22:08.000000000 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.3
 #
 # Copyright 2008, Red Hat, Inc
 # Steve 'Ashcrow' Milner <smilner@xxxxxxxxxx>
diff -uNr func-0.24.orig/scripts/funcd func-0.24/scripts/funcd
--- func-0.24.orig/scripts/funcd	2008-07-29 14:44:39.000000000 -0500
+++ func-0.24/scripts/funcd	2008-12-31 11:22:20.000000000 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.3
 
 ##
 ## Copyright 2007-2008, Red Hat Inc
diff -uNr func-0.24.orig/scripts/func-inventory func-0.24/scripts/func-inventory
--- func-0.24.orig/scripts/func-inventory	2008-07-29 14:44:39.000000000 -0500
+++ func-0.24/scripts/func-inventory	2008-12-31 11:22:25.000000000 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.3
 
 ##
 ## Copyright 2007-2008, Red Hat Inc
diff -uNr func-0.24.orig/scripts/func-transmit func-0.24/scripts/func-transmit
--- func-0.24.orig/scripts/func-transmit	2008-11-16 19:39:58.000000000 -0600
+++ func-0.24/scripts/func-transmit	2008-12-31 11:22:06.000000000 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.3
 
 ##
 ## func yaml wrapper tool.
diff -uNr func-0.24.orig/setup.py func-0.24/setup.py
--- func-0.24.orig/setup.py	2008-11-16 19:39:58.000000000 -0600
+++ func-0.24/setup.py	2008-12-31 11:22:29.000000000 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.3
 
 from distutils.core import setup
 #from setuptools import setup,find_packages

_______________________________________________
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