rpms/func/devel func.spec,1.11,1.12 sources,1.11,1.12

[Adrian Likins]

Author: alikins

Update of /cvs/pkgs/rpms/func/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8676/devel

Modified Files:
	func.spec sources 
Log Message:
rev release to 5 for rebuild



Index: func.spec
===================================================================
RCS file: /cvs/pkgs/rpms/func/devel/func.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- func.spec	17 Dec 2008 21:51:49 -0000	1.11
+++ func.spec	19 Feb 2009 17:00:41 -0000	1.12
@@ -1,31 +1,43 @@
+%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 management framework
 Name: func
-Source1: version
-Version: %(echo `awk '{ print $1 }' %{SOURCE1}`)
-Release: %(echo `awk '{ print $2 }' %{SOURCE1}`)%{?dist}
+Version: 0.24 
+Release: 5%{?dist}
 Source0: %{name}-%{version}.tar.gz
 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 +47,9 @@
 
 %prep
 %setup -q
+%if 0%{?rhel} == 3
+%patch0 -p1
+%endif
 
 %build
 %{__python} setup.py build
@@ -48,7 +63,7 @@
 
 %files
 %defattr(-, root, root, -)
-%if 0%{?fedora} > 8
+%if "%{python_version}" >= "2.5"
 %{python_sitelib}/func*.egg-info
 %endif
 %{_bindir}/funcd
@@ -66,6 +81,8 @@
 %config(noreplace) /etc/func/async_methods.conf
 %config(noreplace) /etc/logrotate.d/func_rotate
 %config(noreplace) /etc/func/modules/Test.conf
+%config(noreplace) /etc/func/modules/Bridge.conf
+%config(noreplace) /etc/func/modules/Vlan.conf
 %dir %{python_sitelib}/func
 %dir %{python_sitelib}/func/minion
 %dir %{python_sitelib}/func/overlord
@@ -135,6 +152,22 @@
 
 
 %changelog
+* Wed Feb 18 2009 Adrian Likins <alikins at redhat.com> - 0.24-5
+- remove version file
+
+* Mon Jan 19 2009 Adrian Likins <alikins at 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 at gmail.com> - 0.24-3
+- Fixed spec because it was only building in rhel3
+
+* Wed Dec 31 2008 Greg Swift <gregswift at gmail.com> - 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 at redhat.com> - 0.24-1
 - require certmaster 0.24 
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/func/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	17 Dec 2008 21:51:49 -0000	1.11
+++ sources	19 Feb 2009 17:00:41 -0000	1.12
@@ -3,4 +3,4 @@
 04b5f281a8f68fdeca61059c2896d1a3  func-0.20.tar.gz
 715638833720c85076fe04cd2e31fc32  func-0.21.tar.gz
 821f5ba123d7fe2e98aa51b8f00a17c2  func-0.23.tar.gz
-36b8a5190c0d6f12973ebdfb02f63652  func-0.24.tar.gz
+f8c91c5f50c6210b7058dbeedb6eea2a  func-0.24.tar.gz