rpms/cobbler/EL-4 cobbler.spec,1.74,1.75 sources,1.73,1.74

[John Eckersberg]

Author: jeckersb

Update of /cvs/pkgs/rpms/cobbler/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20657

Modified Files:
	cobbler.spec sources 
Log Message:
2.0.2-2 release


Index: cobbler.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cobbler/EL-4/cobbler.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- cobbler.spec	2 Oct 2009 20:59:48 -0000	1.74
+++ cobbler.spec	7 Dec 2009 23:01:13 -0000	1.75
@@ -6,8 +6,8 @@ Summary: Boot server configurator
 Name: cobbler
 License: GPLv2+
 AutoReq: no
-Version: 2.0.1
-Release: 1%{?dist}
+Version: 2.0.2
+Release: 2%{?dist}
 Source0: cobbler-%{version}.tar.gz
 Group: Applications/System
 Requires: python >= 2.3
@@ -214,6 +214,9 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 %{python_sitelib}/cobbler/*.py*
 #%{python_sitelib}/cobbler/server/*.py*
 %{python_sitelib}/cobbler/modules/*.py*
+%if 0%{?fedora} >= 9 || 0%{?rhel} >= 5
+%exclude %{python_sitelib}/cobbler/sub_process.py*
+%endif
 %{_mandir}/man1/cobbler.1.gz
 /etc/init.d/cobblerd
 %if 0%{?suse_version} >= 1000
@@ -291,7 +294,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 %package -n koan
 
 Summary: Helper tool that performs cobbler orders on remote machines.
-Version: 2.0.1
+Version: 2.0.2
 Release: 1%{?dist}
 Group: Applications/System
 Requires: mkinitrd
@@ -329,6 +332,11 @@ of an existing system.  For use with a b
 %{_bindir}/cobbler-register
 %dir %{python_sitelib}/koan
 %{python_sitelib}/koan/*.py*
+%if 0%{?fedora} >= 9 || 0%{?rhel} >= 5
+%exclude %{python_sitelib}/koan/sub_process.py*
+%exclude %{python_sitelib}/koan/opt_parse.py*
+%exclude %{python_sitelib}/koan/text_wrap.py*
+%endif
 %{_mandir}/man1/koan.1.gz
 %{_mandir}/man1/cobbler-register.1.gz
 %dir /var/log/koan
@@ -338,7 +346,7 @@ of an existing system.  For use with a b
 %package -n cobbler-web
 
 Summary: Web interface for Cobbler
-Version: 2.0.1
+Version: 2.0.2
 Release: 1%{?dist}
 Group: Applications/System
 Requires: cobbler
@@ -368,12 +376,14 @@ Web interface for Cobbler that allows vi
 %dir /usr/share/cobbler/web/cobbler_web
 /usr/share/cobbler/web/cobbler_web/*
 %config(noreplace) /etc/httpd/conf.d/cobbler_web.conf
-%dir /usr/share/cobbler/web/sessions
+%dir /var/lib/cobbler/webui_sessions
 %dir /var/www/cobbler_webui_content
 /var/www/cobbler_webui_content/*
 %doc AUTHORS COPYING CHANGELOG README
 
 %changelog
+* Mon Nov 23 2009 John Eckersberg <jeckersb at redhat.com> - 2.0.2-2
+- Upstream changes (see CHANGELOG)
 
 * Tue Sep 15 2009 Michael DeHaan <mdehaan at redhat.com> - 2.0.0-1
 - First release with unified spec files


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cobbler/EL-4/sources,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- sources	2 Oct 2009 20:59:48 -0000	1.73
+++ sources	7 Dec 2009 23:01:13 -0000	1.74
@@ -1,5 +1 @@
-0b53db8bdc0259dca8c7bd848c3dd813  cobbler-1.6.4.tar.gz
-524b6946549c2d75c0e8cafcbffecd34  cobbler-1.6.5.tar.gz
-2b7d2b92c1cfbf534b8e83b2a51cf739  cobbler-1.6.6.tar.gz
-5e7ac645a1a8fca384959966aed807c8  cobbler-2.0.0.tar.gz
-c07c857b1f91764d0ea78c2a5a184259  cobbler-2.0.1.tar.gz
+2ca78c5e89ccfc593ead43eaf1f580b6  cobbler-2.0.2.tar.gz