rpms/cobbler/F-10 .cvsignore, 1.58, 1.59 cobbler.spec, 1.78, 1.79 sources, 1.73, 1.74

[Michael DeHaan]

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv436/F-10

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
This is Cobbler 2.0.1, which is 2.0+bugfixes so we can eventually push this to stable.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-10/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- .cvsignore	17 Sep 2009 16:54:09 -0000	1.58
+++ .cvsignore	2 Oct 2009 20:59:48 -0000	1.59
@@ -55,3 +55,4 @@ cobbler-1.6.4.tar.gz
 cobbler-1.6.5.tar.gz
 cobbler-1.6.6.tar.gz
 cobbler-2.0.0.tar.gz
+cobbler-2.0.1.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-10/cobbler.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- cobbler.spec	17 Sep 2009 16:54:09 -0000	1.78
+++ cobbler.spec	2 Oct 2009 20:59:48 -0000	1.79
@@ -6,7 +6,7 @@ Summary: Boot server configurator
 Name: cobbler
 License: GPLv2+
 AutoReq: no
-Version: 2.0.0
+Version: 2.0.1
 Release: 1%{?dist}
 Source0: cobbler-%{version}.tar.gz
 Group: Applications/System
@@ -76,8 +76,7 @@ integrates with cobbler.  There is also 
 include importing distributions from DVDs and rsync 
 mirrors, kickstart templating, integrated yum 
 mirroring, and built-in DHCP/DNS Management.  Cobbler has 
-a Python and XMLRPC API for integration with other  
-applications.
+a XMLRPC API for integration with other applications.
 
 %prep
 %setup -q
@@ -292,7 +291,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.0
+Version: 2.0.1
 Release: 1%{?dist}
 Group: Applications/System
 Requires: mkinitrd
@@ -339,7 +338,7 @@ of an existing system.  For use with a b
 %package -n cobbler-web
 
 Summary: Web interface for Cobbler
-Version: 2.0.0
+Version: 2.0.1
 Release: 1%{?dist}
 Group: Applications/System
 Requires: cobbler
@@ -368,9 +367,7 @@ Web interface for Cobbler that allows vi
 /usr/share/cobbler/web/*
 %dir /usr/share/cobbler/web/cobbler_web
 /usr/share/cobbler/web/cobbler_web/*
-#%dir /usr/share/cobbler/web/cobbler_web/templates
-#/usr/share/cobbler/web/cobbler_web/templates/*
-/etc/httpd/conf.d/cobbler_web.conf
+%config(noreplace) /etc/httpd/conf.d/cobbler_web.conf
 %dir /usr/share/cobbler/web/sessions
 %dir /var/www/cobbler_webui_content
 /var/www/cobbler_webui_content/*


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-10/sources,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- sources	17 Sep 2009 16:54:09 -0000	1.73
+++ sources	2 Oct 2009 20:59:48 -0000	1.74
@@ -2,3 +2,4 @@
 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