rpms/cobbler/devel .cvsignore, 1.37, 1.38 cobbler.spec, 1.50, 1.51 sources, 1.46, 1.47

[Michael DeHaan]

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13404/devel

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
1.2.0 release of cobbler




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	7 Jul 2008 19:37:03 -0000	1.37
+++ .cvsignore	29 Aug 2008 20:28:51 -0000	1.38
@@ -34,3 +34,4 @@
 cobbler-1.0.1.tar.gz
 cobbler-1.0.2.tar.gz
 cobbler-1.0.3.tar.gz
+cobbler-1.2.0.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/cobbler.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- cobbler.spec	7 Jul 2008 19:37:03 -0000	1.50
+++ cobbler.spec	29 Aug 2008 20:28:51 -0000	1.51
@@ -2,7 +2,7 @@
 Summary: Boot server configurator
 Name: cobbler
 AutoReq: no
-Version: 1.0.3
+Version: 1.2.0
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
@@ -55,15 +55,19 @@
 %{__python} setup.py install --optimize=1 --root=$RPM_BUILD_ROOT
 
 %post
-cp /var/lib/cobbler/distros*  /var/lib/cobbler/backup 2>/dev/null
-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
+if [ -e /var/lib/cobbler/distros ]; then
+    cp /var/lib/cobbler/distros*  /var/lib/cobbler/backup 2>/dev/null
+    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
+fi
+if [ -e /var/lib/cobbler/config ]; then
+    cp -a /var/lib/cobbler/config    /var/lib/cobbler/backup 2>/dev/null
+fi
 /usr/bin/cobbler reserialize
 /sbin/chkconfig --add cobblerd
 /sbin/service cobblerd condrestart
 
-
 %preun
 if [ $1 = 0 ]; then
     /sbin/service cobblerd stop >/dev/null 2>&1 || :
@@ -98,8 +102,6 @@
 %dir /var/www/cobbler/
 %dir /var/www/cobbler/localmirror
 %dir /var/www/cobbler/repo_mirror
-%dir /var/www/cobbler/repos_profile
-%dir /var/www/cobbler/repos_system
 %dir /var/www/cobbler/ks_mirror
 %dir /var/www/cobbler/ks_mirror/config
 %dir /var/www/cobbler/images
@@ -115,6 +117,10 @@
 %defattr(755,root,root)
 %{_bindir}/cobbler
 %{_bindir}/cobblerd
+%{_bindir}/cobbler-completion
+
+# %defattr(644,root,root)
+# %config(noreplace) /etc/bash_completion.d/cobbler_bash
 
 %defattr(-,root,root)
 %dir /etc/cobbler
@@ -141,6 +147,12 @@
 
 %defattr(755,root,root)
 %dir /var/lib/cobbler
+%dir /var/lib/cobbler/config/
+%dir /var/lib/cobbler/config/distros.d/
+%dir /var/lib/cobbler/config/profiles.d/
+%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/kickstarts/
 %dir /var/lib/cobbler/backup/
 %dir /var/lib/cobbler/triggers/add/distro/pre
@@ -164,6 +176,7 @@
 %dir /var/lib/cobbler/triggers/install/pre
 %dir /var/lib/cobbler/triggers/install/post
 %dir /var/lib/cobbler/snippets/
+/var/lib/cobbler/completions
 
 %defattr(744,root,root)
 %config(noreplace) /var/lib/cobbler/triggers/sync/post/restart-services.trigger
@@ -173,6 +186,9 @@
 %defattr(664,root,root)
 %config(noreplace) /etc/cobbler/settings
 %config(noreplace) /var/lib/cobbler/snippets/partition_select
+%config(noreplace) /var/lib/cobbler/snippets/pre_partition_select
+%config(noreplace) /var/lib/cobbler/snippets/main_partition_select
+%config(noreplace) /var/lib/cobbler/snippets/post_install_kernel_options
 /var/lib/cobbler/elilo-3.6-ia64.efi
 /var/lib/cobbler/menu.c32
 %defattr(660,root,root)
@@ -190,7 +206,10 @@
 
 %changelog
 
-* Mon Jul 07 2008 Michael DeHaan <mdehaan at redhat.com> - 1.0.3-1
+* Fri Aug 29 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.0-1
+- Upstream changes (see CHANGELOG)
+
+* Tue Jun 10 2008 Michael DeHaan <mdehaan at redhat.com> - 1.0.3-1
 - Upstream changes (see CHANGELOG)
 
 * Mon Jun 09 2008 Michael DeHaan <mdehaan at redhat.com> - 1.0.2-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	7 Jul 2008 19:37:03 -0000	1.46
+++ sources	29 Aug 2008 20:28:51 -0000	1.47
@@ -1,3 +1,4 @@
 2ca6fd737b4c47e7a986cc99bafa1d60  cobbler-1.0.1.tar.gz
 a5ab7e39d616e3a13269b6fe088aec4c  cobbler-1.0.2.tar.gz
 95a1dbfc2c4b7e21adb41524c68c9456  cobbler-1.0.3.tar.gz
+7a68d84001d62eb1afeee16994f48746  cobbler-1.2.0.tar.gz