rpms/snake/devel snake.spec,1.2,1.3 sources,1.3,1.4

[James Laska (jlaska)]

Author: jlaska

Update of /cvs/pkgs/rpms/snake/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6145/devel

Modified Files:
	snake.spec sources 
Log Message:
Updated spec file to play nice with egg-info files




Index: snake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/snake/devel/snake.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- snake.spec	16 Jan 2008 18:11:17 -0000	1.2
+++ snake.spec	16 Jan 2008 20:47:08 -0000	1.3
@@ -3,15 +3,19 @@
 Name:           snake
 Summary:        Smart Network Automated Kickstart Environment
 Version:        0.10
-Release:        0.1git%{?dist}
+Release:        0.2git%{?dist}
 Source0:        http://hosted.fedoraproject.org/projects/snake/SnakeReleases/%{name}-%{version}.tar.bz2
 License:        GPLv2+
 Group:          Applications/Internet
 URL:            http://hosted.fedoraproject.org/projects/snake/
+Requires:       yum
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch:      noarch
-BuildRequires:  python-devel
-Requires:       yum
+%if 0%{?fedora} > 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
 
 
 %description
@@ -36,12 +40,21 @@
 
 
 %build
-%{__python} setup.py 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
-%{__python} setup.py install --root $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}
 
@@ -84,6 +97,7 @@
 %{python_sitelib}/snake/util.py*
 %{python_sitelib}/snake/xmlhelper.py*
 %{python_sitelib}/snake/zeroconf.py*
+%{python_sitelib}/snake-%{version}-*.egg-info
 %doc %{_mandir}/man1/snake-tree.1.gz
 %doc %{_mandir}/man1/snake-ks.1.gz
 %doc %{_mandir}/man1/snake-install.1.gz
@@ -115,7 +129,10 @@
 
 
 %changelog
-* Tue Jan 8 2008 James Laska <jlaska at redhat.com> 0.10-0.1git
+* Wed Jan 16 2008 James Laska <jlaska at redhat.com> 0.10-0.2git
+- Fix snake.spec for better handling of F9 .egg-info files
+
+* Tue Jan 15 2008 James Laska <jlaska at redhat.com> 0.10-0.1git
 - Ticket#6 - Initial support for alternative kickstart delivery support (jlaska)
 - Created man pages (snake-install, snake-ks, and snake-tree) (jlaska)
 - Created man pages (snake-install, snake-ks, and snake-tree) (jlaska)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/snake/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Jan 2008 18:11:17 -0000	1.3
+++ sources	16 Jan 2008 20:47:08 -0000	1.4
@@ -1 +1 @@
-b97089acd2ccd8ade697236b3a83bd89  snake-0.10.tar.bz2
+f72759c922da7bd3af906d002cbf0ed8  snake-0.10.tar.bz2