rpms/cobbler/EL-5 .cvsignore, 1.57, 1.58 cobbler.spec, 1.68, 1.69 sources, 1.69, 1.70
Michael DeHaan
mdehaan at fedoraproject.org
Mon Apr 20 18:10:58 UTC 2009
- Previous message: rpms/cobbler/EL-4 .cvsignore, 1.53, 1.54 cobbler.spec, 1.66, 1.67 sources, 1.66, 1.67
- Next message: rpms/cobbler/F-10 .cvsignore, 1.53, 1.54 cobbler.spec, 1.71, 1.72 sources, 1.67, 1.68
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mdehaan
Update of /cvs/extras/rpms/cobbler/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29916/EL-5
Modified Files:
.cvsignore cobbler.spec sources
Log Message:
This is 1.6.3
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-5/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- .cvsignore 30 Mar 2009 15:29:12 -0000 1.57
+++ .cvsignore 20 Apr 2009 18:10:27 -0000 1.58
@@ -54,3 +54,4 @@
cobbler-1.4.3.tar.gz
cobbler-1.6.1.tar.gz
cobbler-1.6.2.tar.gz
+cobbler-1.6.3.tar.gz
Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-5/cobbler.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- cobbler.spec 30 Mar 2009 15:29:12 -0000 1.68
+++ cobbler.spec 20 Apr 2009 18:10:27 -0000 1.69
@@ -3,12 +3,17 @@
Summary: Boot server configurator
Name: cobbler
AutoReq: no
-Version: 1.6.2
+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
@@ -50,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
@@ -64,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/power Management. Cobbler has
+mirroring, and built-in DHCP/DNS Management. Cobbler has
a Python and XMLRPC API for integration with other
applications. There is also a web interface.
@@ -89,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
@@ -208,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
@@ -217,6 +221,7 @@
%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
@@ -296,47 +301,13 @@
%changelog
-* Mon Mar 30 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.2-1
-- Upstream changes (see CHANGELOG)
-
-* Fri Mar 27 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.1-1
-- Upstream changes (see CHANGELOG)
-
-* 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
+* Mon Mar 30 2009 Michael DeHaan <mdehaan at redhat.com> - 1.7.0-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
+* 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/EL-5/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- sources 30 Mar 2009 15:29:12 -0000 1.69
+++ sources 20 Apr 2009 18:10:27 -0000 1.70
@@ -1,3 +1,4 @@
d560692f78ca9b60d25c7ef79633fc5e cobbler-1.4.3.tar.gz
41cd0b61d1c148e953b879abe722b419 cobbler-1.6.1.tar.gz
9ddcaa7c7fce9e572384f12025d713ed cobbler-1.6.2.tar.gz
+271205209c62805a82578773d34ace86 cobbler-1.6.3.tar.gz
- Previous message: rpms/cobbler/EL-4 .cvsignore, 1.53, 1.54 cobbler.spec, 1.66, 1.67 sources, 1.66, 1.67
- Next message: rpms/cobbler/F-10 .cvsignore, 1.53, 1.54 cobbler.spec, 1.71, 1.72 sources, 1.67, 1.68
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list