rpms/cobbler/F-10 cobbler.spec,1.72,1.73

[Michael DeHaan]

Author: mdehaan

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

Modified Files:
	cobbler.spec 
Log Message:
Update specfile




Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-10/cobbler.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- cobbler.spec	20 Apr 2009 18:10:28 -0000	1.72
+++ cobbler.spec	20 Apr 2009 22:29:19 -0000	1.73
@@ -3,7 +3,7 @@
 Summary: Boot server configurator
 Name: cobbler
 AutoReq: no
-Version: 1.7.0
+Version: 1.6.3
 Release: 1%{?dist}
 ExclusiveArch: %{ix86} x86_64 ppc ppc64 s390x
 Source0: %{name}-%{version}.tar.gz
@@ -66,7 +66,7 @@
 integrates with cobbler.  Cobbler's advanced features 
 include importing distributions from DVDs and rsync 
 mirrors, kickstart templating, integrated yum 
-mirroring, and built-in DHCP/DNS Management.  Cobbler has 
+mirroring, and built-in DHCP/DNS/power Management.  Cobbler has 
 a Python and XMLRPC API for integration with other  
 applications.  There is also a web interface.
 
@@ -91,7 +91,6 @@
     cp /var/lib/cobbler/profiles* /var/lib/cobbler/backup 2>/dev/null
     cp /var/lib/cobbler/systems*  /var/lib/cobbler/backup 2>/dev/null
     cp /var/lib/cobbler/repos*    /var/lib/cobbler/backup 2>/dev/null
-    cp /var/lib/cobbler/networks* /var/lib/cobbler/backup 2>/dev/null
 fi
 if [ -e /var/lib/cobbler/config ]; then
     cp -a /var/lib/cobbler/config    /var/lib/cobbler/backup 2>/dev/null
@@ -157,6 +156,7 @@
 %defattr(755,apache,apache)
 %dir /var/log/cobbler
 %dir /var/log/cobbler/kicklog
+%dir /var/log/cobbler/anamon
 %dir /var/www/cobbler/
 %dir /var/www/cobbler/localmirror
 %dir /var/www/cobbler/repo_mirror
@@ -211,7 +211,6 @@
 %config(noreplace) /etc/httpd/conf.d/cobbler_svc.conf
 %endif
 %dir /var/log/cobbler/syslog
-%dir /var/log/cobbler/anamon
 
 %defattr(755,root,root)
 %dir /var/lib/cobbler
@@ -221,7 +220,6 @@
 %dir /var/lib/cobbler/config/systems.d/
 %dir /var/lib/cobbler/config/repos.d/
 %dir /var/lib/cobbler/config/images.d/
-%dir /var/lib/cobbler/config/networks.d/
 %dir /var/lib/cobbler/kickstarts/
 %dir /var/lib/cobbler/backup/
 %dir /var/lib/cobbler/triggers
@@ -301,7 +299,7 @@
 
 %changelog
 
-* Mon Mar 30 2009 Michael DeHaan <mdehaan at redhat.com> - 1.7.0-1
+* Fri Apr 17 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.3-1
 - Upstream changes (see CHANGELOG)
 
 * Mon Mar 30 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.2-1
@@ -309,5 +307,42 @@
 
 * Fri Mar 27 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.1-1
 - Upstream changes (see CHANGELOG)
->>>>>>> 9f122d9... Fix for cache cleanup problem in Cobblerd (typo), release bump to 1.6.2:cobbler.spec
 
+* Fri Mar 06 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.3-4
+- Upstream changes (see CHANGELOG)
+- Now requires PyYAML
+
+* Thu Feb 12 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.2-1
+- Upstream changes (see CHANGELOG)
+- Adding build_report.trigger
+
+* Mon Jan 09 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.1-1
+- Upstream changes (see CHANGELOG)
+
+* Fri Dec 19 2008 Michael DeHaan <mdehaan at redhat.com> - 1.4.0-4
+- Fix for rawhide python requirement.
+
+* Fri Dec 19 2008 Michael DeHaan <mdehaan at redhat.com> - 1.4.0-2
+- Upstream changes (see CHANGELOG)
+
+* Wed Dec 10 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.4-1
+- Updated test release (see CHANGELOG)
+
+- Upstream changes (see CHANGELOG)
+- Added specfile changes for python 2.6
+* Mon Dec 08 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.3-1
+- Upstream changes (see CHANGELOG)
+- Added specfile changes for python 2.6
+
+* Tue Nov 18 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.2-1
+- Upstream changes (see CHANGELOG)
+- placeholder for future test release
+- packaged /var/lib/cobbler/version
+
+* Fri Nov 14 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.1-1
+- Upstream changes (see CHANGELOG)
+
+* Fri Sep 26 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.0-1
+- Upstream changes (see CHANGELOG)
+- added sample.seed file
+- added /usr/bin/cobbler-ext-nodes