rpms/cobbler/F-8 .cvsignore, 1.48, 1.49 cobbler.spec, 1.57, 1.58 sources, 1.58, 1.59

Mon Apr 20 18:10:59 UTC 2009

Author: mdehaan

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

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
This is 1.6.3




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-8/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49

--- .cvsignore	19 Dec 2008 17:33:19 -0000	1.48
+++ .cvsignore	20 Apr 2009 18:10:28 -0000	1.49
@@ -45,3 +45,4 @@
 cobbler-1.2.8.tar.gz
 cobbler-1.2.9.tar.gz
 cobbler-1.4.0.tar.gz
+cobbler-1.6.3.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-8/cobbler.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- cobbler.spec	19 Dec 2008 17:33:20 -0000	1.57
+++ cobbler.spec	20 Apr 2009 18:10:28 -0000	1.58
@@ -1,13 +1,19 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%define _binaries_in_noarch_packages_terminate_build 0
 Summary: Boot server configurator
 Name: cobbler
 AutoReq: no
-Version: 1.4.0
-Release: 2%{?dist}
+Version: 1.7.0
+Release: 1%{?dist}
+ExclusiveArch: %{ix86} x86_64 ppc ppc64 s390x
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
 Group: Applications/System
 Requires: python >= 2.3
+Requires: python-urlgrabber
+%ifarch %{ix86} x86_64
+Requires: syslinux
+%endif
 %if 0%{?suse_version} >= 1000
 Requires: apache2
 Requires: apache2-mod_python
@@ -21,6 +27,11 @@
 Requires: createrepo
 Requires: python-cheetah
 Requires: rsync
+Requires: python-netaddr
+Requires: PyYAML
+Requires: python-simplejson
+BuildRequires: PyYAML
+Requires: libyaml
 %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
 Requires: genisoimage
 %else
@@ -30,8 +41,8 @@
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
-%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
-Requires: python(abi)=%{pyver}
+%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]" || echo 0)}
+Requires: python(abi) = %{pyver}
 %endif
 %if 0%{?suse_version} < 0
 BuildRequires: redhat-rpm-config
@@ -44,9 +55,6 @@
 BuildRequires: python-setuptools
 %endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildArch: noarch
-ExcludeArch: ppc
-ExcludeArch: ppc64
 Url: http://cobbler.et.redhat.com
 
 %description
@@ -83,6 +91,7 @@
     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
@@ -113,7 +122,7 @@
 %preun
 if [ $1 = 0 ]; then
     /sbin/service cobblerd stop >/dev/null 2>&1 || :
-    chkconfig --del cobblerd
+    chkconfig --del cobblerd || :
 fi
 
 %postun
@@ -157,8 +166,11 @@
 %dir /var/www/cobbler/links
 %defattr(755,apache,apache)
 %dir /var/www/cobbler/webui
+%dir /var/www/cobbler/aux
 %defattr(444,apache,apache)
 /var/www/cobbler/webui/*
+/var/www/cobbler/aux/anamon
+/var/www/cobbler/aux/anamon.init
 
 %defattr(755,root,root)
 %{_bindir}/cobbler
@@ -167,10 +179,14 @@
 
 %defattr(-,root,root)
 %dir /etc/cobbler
+%dir /etc/cobbler/pxe
+%dir /etc/cobbler/reporting
+%dir /etc/cobbler/power
 %config(noreplace) /var/lib/cobbler/kickstarts/*.ks
 %config(noreplace) /var/lib/cobbler/kickstarts/*.seed
 %config(noreplace) /etc/cobbler/*.template
 %config(noreplace) /etc/cobbler/pxe/*.template
+%config(noreplace) /etc/cobbler/reporting/*.template
 %config(noreplace) /etc/cobbler/power/*.template
 %config(noreplace) /etc/cobbler/rsync.exclude
 %config(noreplace) /etc/logrotate.d/cobblerd_rotate
@@ -179,11 +195,9 @@
 %config(noreplace) /etc/cobbler/acls.conf
 %config(noreplace) /etc/cobbler/cheetah_macros
 %dir %{python_sitelib}/cobbler
-%dir %{python_sitelib}/cobbler/yaml
 %dir %{python_sitelib}/cobbler/modules
 %dir %{python_sitelib}/cobbler/webui
 %{python_sitelib}/cobbler/*.py*
-%{python_sitelib}/cobbler/yaml/*.py*
 %{python_sitelib}/cobbler/server/*.py*
 %{python_sitelib}/cobbler/modules/*.py*
 %{python_sitelib}/cobbler/webui/*.py*
@@ -197,6 +211,7 @@
 %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
@@ -206,9 +221,11 @@
 %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
+%dir /var/lib/cobbler/triggers/change
 %dir /var/lib/cobbler/triggers/add
 %dir /var/lib/cobbler/triggers/add/distro
 %dir /var/lib/cobbler/triggers/add/distro/pre
@@ -243,11 +260,6 @@
 %dir /var/lib/cobbler/triggers/install/post
 %dir /var/lib/cobbler/snippets/
 
-%defattr(744,root,root)
-%config(noreplace) /var/lib/cobbler/triggers/sync/post/restart-services.trigger
-%config(noreplace) /var/lib/cobbler/triggers/install/pre/status_pre.trigger
-%config(noreplace) /var/lib/cobbler/triggers/install/post/status_post.trigger
-
 %defattr(664,root,root)
 %config(noreplace) /etc/cobbler/settings
 /var/lib/cobbler/version
@@ -262,10 +274,18 @@
 %config(noreplace) /var/lib/cobbler/snippets/func_register_if_enabled
 %config(noreplace) /var/lib/cobbler/snippets/download_config_files
 %config(noreplace) /var/lib/cobbler/snippets/koan_environment
+%config(noreplace) /var/lib/cobbler/snippets/pre_anamon
+%config(noreplace) /var/lib/cobbler/snippets/post_anamon
+%config(noreplace) /var/lib/cobbler/snippets/post_s390_reboot
 %config(noreplace) /var/lib/cobbler/snippets/redhat_register
+%config(noreplace) /var/lib/cobbler/snippets/cobbler_register
+%config(noreplace) /var/lib/cobbler/snippets/keep_ssh_host_keys
+%config(noreplace) /var/lib/cobbler/snippets/log_ks_pre
+%config(noreplace) /var/lib/cobbler/snippets/log_ks_post
 /var/lib/cobbler/elilo-3.8-ia64.efi
 /var/lib/cobbler/menu.c32
 /var/lib/cobbler/yaboot-1.3.14
+/var/lib/cobbler/zpxe.rexx
 %defattr(660,root,root)
 %config(noreplace) /etc/cobbler/users.digest 
 
@@ -281,27 +301,13 @@
 
 %changelog
 
-* 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)
-
+* Mon Mar 30 2009 Michael DeHaan <mdehaan at redhat.com> - 1.7.0-1
 - 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
+* Mon Mar 30 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.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
+* 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 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


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-8/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sources	19 Dec 2008 17:52:50 -0000	1.58
+++ sources	20 Apr 2009 18:10:28 -0000	1.59
@@ -1 +1,2 @@
 6bf3dae4f204b44858ba91faeb8a1ecf  cobbler-1.4.0.tar.gz
+271205209c62805a82578773d34ace86  cobbler-1.6.3.tar.gz


