rpms/snake/F-8 snake.spec,1.3,1.4 sources,1.4,1.5

[James Laska (jlaska)]

Author: jlaska

Update of /cvs/pkgs/rpms/snake/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20474/F-8

Modified Files:
	snake.spec sources 
Log Message:
snake-0.10-0.4git




Index: snake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/snake/F-8/snake.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- snake.spec	17 Jan 2008 15:30:59 -0000	1.3
+++ snake.spec	25 Jan 2008 13:00:38 -0000	1.4
@@ -1,9 +1,10 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?build_server: %define build_server %(%{__python} -c "import pykickstart.version;" 2>/dev/null && echo 1 || echo 0)}
 
 Name:           snake
 Summary:        Smart Network Automated Kickstart Environment
 Version:        0.10
-Release:        0.3git%{?dist}
+Release:        0.4git%{?dist}
 Source0:        http://hosted.fedoraproject.org/projects/snake/SnakeReleases/%{name}-%{version}.tar.bz2
 License:        GPLv2+
 Group:          Applications/Internet
@@ -12,7 +13,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch:      noarch
 BuildRequires:  python-devel
-%if 0%{?fedora} > 8
+%if 0%{?fedora} >= 8
 BuildRequires:  python-setuptools-devel
 %else
 BuildRequires:  python-setuptools
@@ -41,20 +42,12 @@
 
 
 %build
-%if 0%{?fedora} > 8
-CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
-%else
 CFLAGS="$RPM_OPT_FLAGS" %{__python} -c 'import setuptools; execfile("setup.py")' build
-%endif
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%if 0%{?fedora} > 8
-%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
-%else
 %{__python} -c 'import setuptools; execfile("setup.py")' install --skip-build --root $RPM_BUILD_ROOT
-%endif
 
 install -d $RPM_BUILD_ROOT/%{_localstatedir}/{lib,run,cache}/snake
 install -d $RPM_BUILD_ROOT/%{_localstatedir}/lib/snake/{kickstarts,trees}
@@ -104,6 +97,7 @@
 %doc %{_mandir}/man1/snake-install.1.gz
 
 
+%if %{build_server}
 %files server
 %defattr(-,root,root,-)
 %doc docs/DESIGN
@@ -127,9 +121,16 @@
 %{python_sitelib}/snake/server.py*
 %{python_sitelib}/snake/ksdb.py*
 %{python_sitelib}/snake/treedb.py*
+%endif
 
 
 %changelog
+* Tue Jan 24 2008 James Laska <jlaska at redhat.com> 0.10-0.4git
+- Bug#429479 - conditionally build the snake-server sub-package only when
+  pykickstart.version is found (jlaska)
+- Move more constants to snake/constants.py (jlaska)
+- snake/tree.py - _fill_in_images() called when .treeinfo images are not found (jlaska)
+
 * Wed Jan 17 2008 James Laska <jlaska at redhat.com> 0.10-0.3git
 - Add back python-devel for older Fedora building (jlaska)
 - Remove ListChoiceWindow in favor of snack.ListboxChoiceWindow (jlaska)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/snake/F-8/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	17 Jan 2008 15:30:59 -0000	1.4
+++ sources	25 Jan 2008 13:00:38 -0000	1.5
@@ -1 +1 @@
-3a5d4d68bae939e1da206e3e458cf1b1  snake-0.10.tar.bz2
+3a0a8f14a792fac672c32a8b0a4240ce  snake-0.10.tar.bz2