rpms/snake/EL-5 .cvsignore, 1.2, 1.3 snake.spec, 1.1, 1.2 sources, 1.2, 1.3

Fri Jan 25 13:10:19 UTC 2008

Author: jlaska

Update of /cvs/pkgs/rpms/snake/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27634/EL-5

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




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/snake/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

--- .cvsignore	10 Dec 2007 13:36:45 -0000	1.2
+++ .cvsignore	25 Jan 2008 13:09:44 -0000	1.3
@@ -1 +1 @@
-snake-0.9.tar.bz2
+snake-0.10.tar.bz2


Index: snake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/snake/EL-5/snake.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- snake.spec	10 Dec 2007 13:36:45 -0000	1.1
+++ snake.spec	25 Jan 2008 13:09:44 -0000	1.2
@@ -1,17 +1,23 @@
 %{!?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.9
-Release:        0.5git%{?dist}
+Version:        0.10
+Release:        0.4git%{?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 +42,13 @@
 
 
 %build
-%{__python} setup.py build
+CFLAGS="$RPM_OPT_FLAGS" %{__python} -c 'import setuptools; execfile("setup.py")' build
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install --root $RPM_BUILD_ROOT
+%{__python} -c 'import setuptools; execfile("setup.py")' install --skip-build --root $RPM_BUILD_ROOT
+
 install -d $RPM_BUILD_ROOT/%{_localstatedir}/{lib,run,cache}/snake
 install -d $RPM_BUILD_ROOT/%{_localstatedir}/lib/snake/{kickstarts,trees}
 
@@ -66,30 +73,40 @@
 %doc README LICENSE
 %{_sbindir}/snake-install
 %{_sbindir}/snake-install-tui
+%{_sbindir}/snake-tree
+%{_sbindir}/snake-ks
 %{_bindir}/snake-rawhide-status
 %dir %{python_sitelib}/snake
 %{python_sitelib}/snake/__init__.py*
+%{python_sitelib}/snake/client.py*
+%{python_sitelib}/snake/constants.py*
 %{python_sitelib}/snake/dbushelper.py*
+%{python_sitelib}/snake/install.py*
+%{python_sitelib}/snake/log.py*
 %{python_sitelib}/snake/machineinfo.py*
 %{python_sitelib}/snake/saverestore.py*
-%{python_sitelib}/snake/zeroconf.py*
-%{python_sitelib}/snake/client.py*
-%{python_sitelib}/snake/install.py*
-%{python_sitelib}/snake/uri.py*
+%{python_sitelib}/snake/tui.py*
 %{python_sitelib}/snake/tree.py*
+%{python_sitelib}/snake/uri.py*
+%{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
 
 
+%if %{build_server}
 %files server
 %defattr(-,root,root,-)
 %doc docs/DESIGN
 %{_sbindir}/snake-server
-%{_sbindir}/snake-tree
-%{_sbindir}/snake-ks
 %dir %{_localstatedir}/run/snake
 %dir %{_localstatedir}/cache/snake
 %dir %{_localstatedir}/lib/snake
 %dir %{_localstatedir}/lib/snake/kickstarts
+%{_localstatedir}/lib/snake/kickstarts/minimal.ks
 %dir %{_localstatedir}/lib/snake/trees
 %config(noreplace) %{_sysconfdir}/snake.conf
 %{_sysconfdir}/init.d/snake-server
@@ -102,12 +119,35 @@
 %{python_sitelib}/snake/machine.py*
 %{python_sitelib}/snake/plugins.py*
 %{python_sitelib}/snake/server.py*
-%{python_sitelib}/snake/log.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)
+
+* 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 (jlaska)
+
+* 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)
+- Ticket#31 - added sample minimal.ks template (jlaska)
+- Ticket#15 - make cli tools operate on remote server (jlaska)
+- Ticket#34 - added 'describe' and 'rename' cmds to snake-ks (jlaska)
+- Move tree verification to snake.client.check_tree with proper return codes (wwoods)
+- Ticket#10 - created snake/tui.py to handle text-mode snack screens (jlaska)
+
 * Thu Dec 3 2007 James Laska <jlaska at redhat.com> 0.9-0.5git
 - Fix bug#12 - make snake-install python2.3 friendly (jlaska)
 - Support for ext2 initrd's (jlaska)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/snake/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Dec 2007 13:36:45 -0000	1.2
+++ sources	25 Jan 2008 13:09:44 -0000	1.3
@@ -1 +1 @@
-04fcf979712372a2f0fbb65ed4b36877  snake-0.9.tar.bz2
+3a0a8f14a792fac672c32a8b0a4240ce  snake-0.10.tar.bz2


