From 24c9c45bf4b2bb8d69d5d2eb683fa55517d82444 Mon Sep 17 00:00:00 2001
From: Michael DeHaan <mdehaan@redhat.com>
Date: Thu, 15 Nov 2007 16:31:20 -0500
Subject: Fix bug related to hash evaluation, bump release for testing branch

---
 cobbler.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'cobbler.spec')

diff --git a/cobbler.spec b/cobbler.spec
index 3de7850..e7b0599 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Summary: Boot server configurator
 Name: cobbler
-Version: 0.6.4
-Release: 2%{?dist}
+Version: 0.7.0
+Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
 Group: Applications/System
@@ -192,6 +192,9 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 
 %changelog
 
+* Thu Nov 15 2007 Michael DeHaan <mdehaan@redhat.com> - 0.7.0-1
+- Upstream changes (see CHANGELOG), testing branch
+
 * Wed Nov 14 2007 Michael DeHaan <mdehaan@redhat.com> - 0.6.4-2
 - Upstream changes (see CHANGELOG)
 - Permissions changes
-- 
cgit 


From 6883cbe9f59f72a72001ab0862df8b78e18e632c Mon Sep 17 00:00:00 2001
From: Michael DeHaan <mdehaan@redhat.com>
Date: Fri, 16 Nov 2007 17:16:46 -0500
Subject: Don't require syslinux, remove unused bits from RPM specfile.

---
 cobbler.spec | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'cobbler.spec')

diff --git a/cobbler.spec b/cobbler.spec
index e7b0599..7bf245c 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -14,9 +14,6 @@ Requires: createrepo
 Requires: mod_python
 Requires: python-cheetah
 Requires: rhpl
-%ifarch i386 i686 x86_64
-Requires: syslinux
-%endif
 Requires(post):  /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
@@ -194,6 +191,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 
 * Thu Nov 15 2007 Michael DeHaan <mdehaan@redhat.com> - 0.7.0-1
 - Upstream changes (see CHANGELOG), testing branch
+- Don't require syslinux
 
 * Wed Nov 14 2007 Michael DeHaan <mdehaan@redhat.com> - 0.6.4-2
 - Upstream changes (see CHANGELOG)
-- 
cgit 


From 231ef515b22aa0204c625340f492eba651ef4bae Mon Sep 17 00:00:00 2001
From: Michael DeHaan <mdehaan@redhat.com>
Date: Thu, 29 Nov 2007 14:58:46 -0500
Subject: Initial application of Tim V's patch to enable post install triggers.

---
 cobbler.spec | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'cobbler.spec')

diff --git a/cobbler.spec b/cobbler.spec
index 7bf245c..b3bbd85 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -78,6 +78,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 %dir /var/www/cgi-bin/cobbler/
 /var/www/cgi-bin/cobbler/findks.cgi
 /var/www/cgi-bin/cobbler/nopxe.cgi
+/var/www/cgi-bin/cobbler/postinstalltrigger.cgi
 /var/www/cgi-bin/cobbler/webui.cgi
 %defattr(660,apache,apache)
 %config(noreplace) /var/www/cgi-bin/cobbler/.htaccess
@@ -167,6 +168,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/cobbler/triggers/delete/repo/post
 %dir /var/lib/cobbler/triggers/sync/pre
 %dir /var/lib/cobbler/triggers/sync/post
+%dir /var/lib/cobbler/triggers/install/post
 %dir /var/lib/cobbler/snippets/
 
 %defattr(744,root,root)
-- 
cgit 


From 4547a2759ce5369774676f16365492f14aad2392 Mon Sep 17 00:00:00 2001
From: Michael DeHaan <mdehaan@redhat.com>
Date: Thu, 29 Nov 2007 17:05:04 -0500
Subject: Slight changes to post install triggers patch, namely adding some
 underscores.

---
 cobbler.spec | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'cobbler.spec')

diff --git a/cobbler.spec b/cobbler.spec
index b3bbd85..1660c36 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -76,10 +76,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 
 %defattr(755,apache,apache)
 %dir /var/www/cgi-bin/cobbler/
-/var/www/cgi-bin/cobbler/findks.cgi
-/var/www/cgi-bin/cobbler/nopxe.cgi
-/var/www/cgi-bin/cobbler/postinstalltrigger.cgi
-/var/www/cgi-bin/cobbler/webui.cgi
+/var/www/cgi-bin/cobbler/*.cgi
 %defattr(660,apache,apache)
 %config(noreplace) /var/www/cgi-bin/cobbler/.htaccess
 %config(noreplace) /var/www/cgi-bin/cobbler/.htpasswd
-- 
cgit 


From 57ef142ab094e156bb25b077ce16563dfde5a8ff Mon Sep 17 00:00:00 2001
From: Michael DeHaan <mdehaan@redhat.com>
Date: Mon, 3 Dec 2007 17:38:49 -0500
Subject: First start of pluggable authn/authz system for remote API + web
 interface, using Apache modules.

---
 cobbler.spec | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'cobbler.spec')

diff --git a/cobbler.spec b/cobbler.spec
index 1660c36..3fc9bb0 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -75,6 +75,8 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 %files
 
 %defattr(755,apache,apache)
+%dir /var/www/cobbler/web/
+/var/www/cobbler/web/*.py
 %dir /var/www/cgi-bin/cobbler/
 /var/www/cgi-bin/cobbler/*.cgi
 %defattr(660,apache,apache)
-- 
cgit 


From c7220a9340069f8bc9cc0f7cb840ada3a9cd994d Mon Sep 17 00:00:00 2001
From: Michael DeHaan <mdehaan@redhat.com>
Date: Wed, 5 Dec 2007 15:43:13 -0500
Subject: Work on making the default service authenticator grok Apache htdigest
 files.

---
 cobbler.spec | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'cobbler.spec')

diff --git a/cobbler.spec b/cobbler.spec
index 3fc9bb0..10f853d 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -79,9 +79,6 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 /var/www/cobbler/web/*.py
 %dir /var/www/cgi-bin/cobbler/
 /var/www/cgi-bin/cobbler/*.cgi
-%defattr(660,apache,apache)
-%config(noreplace) /var/www/cgi-bin/cobbler/.htaccess
-%config(noreplace) /var/www/cgi-bin/cobbler/.htpasswd
 
 %defattr(755,apache,apache)
 %dir /usr/share/cobbler/webui_templates
@@ -178,8 +175,8 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 %config(noreplace) /var/lib/cobbler/snippets/partition_select
 /var/lib/cobbler/elilo-3.6-ia64.efi
 /var/lib/cobbler/menu.c32
-%defattr(660,apache,apache)
-%config(noreplace) /etc/cobbler/auth.conf 
+%defattr(660,root,root)
+%config(noreplace) /etc/cobbler/users.digest 
 
 %defattr(664,root,root)
 %config(noreplace) /var/lib/cobbler/cobbler_hosts
-- 
cgit 


From 6bd19ac076e5d4c51317d85fd5d12965e65cae66 Mon Sep 17 00:00:00 2001
From: Michael DeHaan <mdehaan@redhat.com>
Date: Wed, 5 Dec 2007 16:27:03 -0500
Subject: Packaging fixups

---
 cobbler.spec | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'cobbler.spec')

diff --git a/cobbler.spec b/cobbler.spec
index 10f853d..77a246f 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -76,7 +76,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 
 %defattr(755,apache,apache)
 %dir /var/www/cobbler/web/
-/var/www/cobbler/web/*.py
+/var/www/cobbler/web/*.py*
 %dir /var/www/cgi-bin/cobbler/
 /var/www/cgi-bin/cobbler/*.cgi
 
@@ -128,7 +128,6 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 %config(noreplace) /etc/cobbler/rsync.exclude
 %config(noreplace) /etc/logrotate.d/cobblerd_rotate
 %config(noreplace) /etc/cobbler/modules.conf
-%config(noreplace) /etc/cobbler/webui-cherrypy.cfg
 %dir %{python_sitelib}/cobbler
 %dir %{python_sitelib}/cobbler/yaml
 %dir %{python_sitelib}/cobbler/modules
-- 
cgit 


From 0805e18d1e4077605b382acb9322996a90782c4d Mon Sep 17 00:00:00 2001
From: Michael DeHaan <mdehaan@redhat.com>
Date: Wed, 5 Dec 2007 18:59:24 -0500
Subject: Some initial work on kerberos authentication via a helper program,
 some work on making the API have access to the log files and logging
 everything done there.  The logging work, as well as kerb testing, are
 incomplete at this point, though authn_configfile works fine.

---
 cobbler.spec | 1 +
 1 file changed, 1 insertion(+)

(limited to 'cobbler.spec')

diff --git a/cobbler.spec b/cobbler.spec
index 77a246f..afb3db6 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -114,6 +114,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 %dir /tftpboot/images
 %{_bindir}/cobbler
 %{_bindir}/cobblerd
+%{_bindir}/cobbler_auth_help
 %dir /etc/cobbler
 %config(noreplace) /etc/cobbler/default.ks
 %config(noreplace) /etc/cobbler/kickstart_fc5.ks
-- 
cgit 


From 35a0320e643c79aa2380a00e3fdd4bf460d3f1ff Mon Sep 17 00:00:00 2001
From: Michael DeHaan <mdehaan@redhat.com>
Date: Thu, 6 Dec 2007 10:39:05 -0500
Subject: Disable RPM AutoReq to avoid slurping in an unpackaged Perl module
 that we only use when the kerberos auth type is engaged.

---
 cobbler.spec | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'cobbler.spec')

diff --git a/cobbler.spec b/cobbler.spec
index afb3db6..4a8c0be 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -1,6 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Summary: Boot server configurator
 Name: cobbler
+AutoReq: no
 Version: 0.7.0
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
@@ -190,6 +191,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 * Thu Nov 15 2007 Michael DeHaan <mdehaan@redhat.com> - 0.7.0-1
 - Upstream changes (see CHANGELOG), testing branch
 - Don't require syslinux
+- Disable autoreq to avoid slurping in perl modules
 
 * Wed Nov 14 2007 Michael DeHaan <mdehaan@redhat.com> - 0.6.4-2
 - Upstream changes (see CHANGELOG)
-- 
cgit 


From ee982d8decf00b76afb659829946f0c48c40e57b Mon Sep 17 00:00:00 2001
From: Michael DeHaan <mdehaan@redhat.com>
Date: Thu, 6 Dec 2007 10:44:26 -0500
Subject: Requires rsync.

---
 cobbler.spec | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'cobbler.spec')

diff --git a/cobbler.spec b/cobbler.spec
index 4a8c0be..239dbc4 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -15,6 +15,7 @@ Requires: createrepo
 Requires: mod_python
 Requires: python-cheetah
 Requires: rhpl
+Requires: rsync
 Requires(post):  /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
@@ -191,6 +192,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 * Thu Nov 15 2007 Michael DeHaan <mdehaan@redhat.com> - 0.7.0-1
 - Upstream changes (see CHANGELOG), testing branch
 - Don't require syslinux
+- Added requires on rsync
 - Disable autoreq to avoid slurping in perl modules
 
 * Wed Nov 14 2007 Michael DeHaan <mdehaan@redhat.com> - 0.6.4-2
-- 
cgit 


From f21d59c43bd9d5101ef1fadd979b85eb63e124b2 Mon Sep 17 00:00:00 2001
From: Michael DeHaan <mdehaan@redhat.com>
Date: Mon, 10 Dec 2007 17:41:36 -0500
Subject: changelog

---
 cobbler.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cobbler.spec')

diff --git a/cobbler.spec b/cobbler.spec
index 239dbc4..c90dcf0 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -189,7 +189,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 
 %changelog
 
-* Thu Nov 15 2007 Michael DeHaan <mdehaan@redhat.com> - 0.7.0-1
+* Mon Dec 10 2007 Michael DeHaan <mdehaan@redhat.com> - 0.7.0-1
 - Upstream changes (see CHANGELOG), testing branch
 - Don't require syslinux
 - Added requires on rsync
-- 
cgit 


From 8e1b4b1ab5ed6aabbbec2d984f4979474b5ddb90 Mon Sep 17 00:00:00 2001
From: Michael DeHaan <mdehaan@redhat.com>
Date: Fri, 14 Dec 2007 17:49:32 -0500
Subject: Release bump since testing release was yesterday

---
 cobbler.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'cobbler.spec')

diff --git a/cobbler.spec b/cobbler.spec
index c90dcf0..7a3ab25 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -2,7 +2,7 @@
 Summary: Boot server configurator
 Name: cobbler
 AutoReq: no
-Version: 0.7.0
+Version: 0.7.1
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
@@ -189,7 +189,10 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 
 %changelog
 
-* Mon Dec 10 2007 Michael DeHaan <mdehaan@redhat.com> - 0.7.0-1
+* Fri Dec 15 2007 Michael DeHaan <mdehaan@redhat.com> - 0.7.1-1
+- Upstream changes (see CHANGELOG)
+
+* Thu Dec 14 2007 Michael DeHaan <mdehaan@redhat.com> - 0.7.0-1
 - Upstream changes (see CHANGELOG), testing branch
 - Don't require syslinux
 - Added requires on rsync
-- 
cgit 


From 6fc697a71cf29ad66b0e2324998c35b0adbdbff9 Mon Sep 17 00:00:00 2001
From: Michael DeHaan <mdehaan@redhat.com>
Date: Thu, 20 Dec 2007 15:32:52 -0500
Subject: Rename some templates, remove proxy logic that is not necc. for new
 performance plans, remove watcher.py reference

---
 cobbler.spec | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

(limited to 'cobbler.spec')

diff --git a/cobbler.spec b/cobbler.spec
index 7a3ab25..3aac41c 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -118,16 +118,8 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 %{_bindir}/cobblerd
 %{_bindir}/cobbler_auth_help
 %dir /etc/cobbler
-%config(noreplace) /etc/cobbler/default.ks
-%config(noreplace) /etc/cobbler/kickstart_fc5.ks
-%config(noreplace) /etc/cobbler/kickstart_fc6.ks
-%config(noreplace) /etc/cobbler/kickstart_fc6_domU.ks
-%config(noreplace) /etc/cobbler/dhcp.template
-%config(noreplace) /etc/cobbler/dnsmasq.template
-%config(noreplace) /etc/cobbler/pxedefault.template
-%config(noreplace) /etc/cobbler/pxeprofile.template
-%config(noreplace) /etc/cobbler/pxesystem.template
-%config(noreplace) /etc/cobbler/pxesystem_ia64.template
+%config(noreplace) /etc/cobbler/*.ks
+%config(noreplace) /etc/cobbler/*.template
 %config(noreplace) /etc/cobbler/rsync.exclude
 %config(noreplace) /etc/logrotate.d/cobblerd_rotate
 %config(noreplace) /etc/cobbler/modules.conf
@@ -191,6 +183,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 
 * Fri Dec 15 2007 Michael DeHaan <mdehaan@redhat.com> - 0.7.1-1
 - Upstream changes (see CHANGELOG)
+- Generalize what files are included in RPM
 
 * Thu Dec 14 2007 Michael DeHaan <mdehaan@redhat.com> - 0.7.0-1
 - Upstream changes (see CHANGELOG), testing branch
-- 
cgit 


From c221f80474df2027e9c73d44f3c14a622b9043d1 Mon Sep 17 00:00:00 2001
From: Michael DeHaan <mdehaan@redhat.com>
Date: Mon, 7 Jan 2008 11:16:14 -0500
Subject: Add directory to RPM spec file.

---
 cobbler.spec | 1 +
 1 file changed, 1 insertion(+)

(limited to 'cobbler.spec')

diff --git a/cobbler.spec b/cobbler.spec
index 3aac41c..cab4afd 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -129,6 +129,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 %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*
 %{_mandir}/man1/cobbler.1.gz
-- 
cgit 


From dad87389ff25635549141564b23d16645e76f1d3 Mon Sep 17 00:00:00 2001
From: Michael DeHaan <mdehaan@redhat.com>
Date: Mon, 7 Jan 2008 11:17:02 -0500
Subject: Add new python module directory to specfile.

---
 cobbler.spec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'cobbler.spec')

diff --git a/cobbler.spec b/cobbler.spec
index cab4afd..6157fcc 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -182,9 +182,10 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 
 %changelog
 
-* Fri Dec 15 2007 Michael DeHaan <mdehaan@redhat.com> - 0.7.1-1
+* Mon Jan 07 2007 Michael DeHaan <mdehaan@redhat.com> - 0.7.1-1
 - Upstream changes (see CHANGELOG)
 - Generalize what files are included in RPM
+- Add new python module directory
 
 * Thu Dec 14 2007 Michael DeHaan <mdehaan@redhat.com> - 0.7.0-1
 - Upstream changes (see CHANGELOG), testing branch
-- 
cgit 


From 3a794829b1dfcc7ffe436c61e4ddf01bd3102084 Mon Sep 17 00:00:00 2001
From: Michael DeHaan <mdehaan@redhat.com>
Date: Mon, 7 Jan 2008 11:34:27 -0500
Subject: it's 2008, not 2007.

---
 cobbler.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cobbler.spec')

diff --git a/cobbler.spec b/cobbler.spec
index 6157fcc..b0ff79b 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -182,7 +182,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 
 %changelog
 
-* Mon Jan 07 2007 Michael DeHaan <mdehaan@redhat.com> - 0.7.1-1
+* Mon Jan 07 2008 Michael DeHaan <mdehaan@redhat.com> - 0.7.1-1
 - Upstream changes (see CHANGELOG)
 - Generalize what files are included in RPM
 - Add new python module directory
-- 
cgit 


From 3b7621174d86634743c987fbcd62645e6f6f2349 Mon Sep 17 00:00:00 2001
From: Michael DeHaan <mdehaan@redhat.com>
Date: Thu, 10 Jan 2008 16:39:26 -0500
Subject: Add eggs spec code for F9

---
 cobbler.spec | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'cobbler.spec')

diff --git a/cobbler.spec b/cobbler.spec
index b0ff79b..32b1c46 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -22,6 +22,11 @@ Requires(preun): /sbin/service
 BuildRequires: redhat-rpm-config
 BuildRequires: python-devel
 BuildRequires: python-cheetah
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
 ExcludeArch: ppc
-- 
cgit 


From 359a2bd8eb8f39356b4b59135b78ebb567b13140 Mon Sep 17 00:00:00 2001
From: Michael DeHaan <mdehaan@redhat.com>
Date: Thu, 10 Jan 2008 18:21:55 -0500
Subject: Fixes for builds on F9 and later.

---
 cobbler.spec | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'cobbler.spec')

diff --git a/cobbler.spec b/cobbler.spec
index 32b1c46..c852f5f 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -182,6 +182,9 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 %config(noreplace) /var/lib/cobbler/cobbler_hosts
 
 %defattr(-,root,root)
+%if 0%{?fedora} > 8
+%{python_sitearch}/func*.egg-info
+%endif
 %doc AUTHORS CHANGELOG README COPYING
 
 
@@ -191,6 +194,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 - Upstream changes (see CHANGELOG)
 - Generalize what files are included in RPM
 - Add new python module directory
+- Fixes for builds on F9 and later
 
 * Thu Dec 14 2007 Michael DeHaan <mdehaan@redhat.com> - 0.7.0-1
 - Upstream changes (see CHANGELOG), testing branch
-- 
cgit 


From eb932370e804b831efebe4a1660ff8b8db8c0335 Mon Sep 17 00:00:00 2001
From: Michael DeHaan <mdehaan@redhat.com>
Date: Mon, 21 Jan 2008 10:29:40 -0500
Subject: Bump version.  Also add additional virt default values to settings.

---
 cobbler.spec | 109 +++--------------------------------------------------------
 1 file changed, 5 insertions(+), 104 deletions(-)

(limited to 'cobbler.spec')

diff --git a/cobbler.spec b/cobbler.spec
index c852f5f..f33a340 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -2,7 +2,7 @@
 Summary: Boot server configurator
 Name: cobbler
 AutoReq: no
-Version: 0.7.1
+Version: 0.7.2
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
@@ -190,6 +190,10 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 
 %changelog
 
+* Mon Jan 21 2008 Michael DeHaan <mdehaan@redhat.com> - 0.7.2-1
+- Upstream changes (see CHANGELOG)
+- prune changelog, see git for full
+
 * Mon Jan 07 2008 Michael DeHaan <mdehaan@redhat.com> - 0.7.1-1
 - Upstream changes (see CHANGELOG)
 - Generalize what files are included in RPM
@@ -282,106 +286,3 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 - Upstream changes (see CHANGELOG)
 - Cobbler RPM now owns various directories it uses versus creating them using commands.
 - Bundling a copy of Cheetah for older distros
-
-* Mon Jan 28 2007 Michael DeHaan <mdehaan@redhat.com> - 0.3.9-1
-- Changed init script pre/post code to match FC-E guidelines/example
-- Shortened RPM description
-- (also see CHANGELOG)
-
-* Thu Jan 24 2007 Michael DeHaan <mdehaan@redhat.com> - 0.3.8-1
-- Upstream changes (see CHANGELOG)
-
-* Thu Jan 24 2007 Michael DeHaan <mdehaan@redhat.com> - 0.3.7-1
-- Upstream changes (see CHANGELOG)
-- Added packaging for new logfile directory and syslog watcher daemon
-- Added Requires for mod_python
-- Added sample FC6 kickstart that I forgot to add from months ago.  doh!
-- Added FC6 mini domU kickstart
-
-* Thu Dec 21 2006 Michael DeHaan <mdehaan@redhat.com> - 0.3.6-1
-- Upstream changes (see CHANGELOG)
-- Description updated
-- Added mod_python kickstart watcher script and associated logging changes
-
-* Thu Dec 21 2006 Michael DeHaan <mdehaan@redhat.com> - 0.3.5-4
-- Upstream changes (see CHANGELOG)
-- Added createrepo as Requires
-- BuildRequires: python-devel (needed for 2.5)
-
-* Tue Dec 05 2006 Michael DeHaan <mdehaan@redhat.com> - 0.3.4-1
-- Upstream changes (see CHANGELOG)
-
-* Tue Nov 14 2006 Michael DeHaan <mdehaan@redhat.com> - 0.3.3-1
-- Upstream changes (see CHANGELOG)
-
-* Thu Oct 26 2006 Michael DeHaan <mdehaan@redhat.com> - 0.3.2-1
-- Upstream changes (see CHANGELOG)
-
-* Wed Oct 25 2006 Michael DeHaan <mdehaan@redhat.com> - 0.3.1-1
-- Upstream changes (see CHANGELOG)
-- Updated description
-
-* Tue Oct 24 2006 Michael DeHaan <mdehaan@redhat.com> - 0.3.0-1
-- Upstream changes (see CHANGELOG)
-- Marked files in /etc/cobbler as config
-- Marked /etc/cobbler/dhcpd.template as noreplace 
-
-* Tue Oct 24 2006 Michael DeHaan <mdehaan@redhat.com> - 0.2.9-1
-- Upstream changes (see CHANGELOG)
-
-* Wed Oct 18 2006 Michael DeHaan <mdehaan@redhat.com> - 0.2.8-1
-- Upstream changes (see CHANGELOG)
-
-* Tue Oct 17 2006 Michael DeHaan <mdehaan@redhat.com> - 0.2.7-1
-- Upstream changes (see CHANGELOG), includes removing pexpect as a require
-- This RPM now builds on RHEL4
-
-* Tue Oct 17 2006 Michael DeHaan <mdehaan@redhat.com> - 0.2.6-1
-- Upstream changes (see CHANGELOG), includes removing Cheetah as a require
-
-* Mon Oct 16 2006 Michael DeHaan <mdehaan@redhat.com> - 0.2.5-1
-- Upstream features and bugfixes (see CHANGELOG)
-- Packaged additional kickstart file and specfile cleanup
-
-* Thu Oct 12 2006 Michael DeHaan <mdehaan@redhat.com> - 0.2.4-1
-- Upstream features and bugfixes (see CHANGELOG)
-
-* Mon Oct 9 2006 Michael DeHaan <mdehaan@redhat.com> - 0.2.3-1
-- Upstream features (see CHANGELOG) & URL update
-
-* Fri Oct 6 2006 Michael DeHaan <mdehaan@redhat.com> - 0.2.2-1
-- Upstream bugfixes
-
-* Fri Sep 29 2006 Michael DeHaan <mdehaan@redhat.com> - 0.2.1-2
-- URL update
-
-* Thu Sep 28 2006 Michael DeHaan <mdehaan@redhat.com> - 0.2.1-1
-- Upstream pull of bugfixes and new remote system "enchant" feature
-
-* Fri Sep 22 2006 Michael DeHaan <mdehaan@redhat.com> - 0.2.0-1
-- Lots of new PXE and dhcpd.conf upstream, elilo.efi now included.
-
-* Thu Sep 21 2006 Michael DeHaan <mdehaan@redhat.com> - 0.1.1-8
-- Added doc files to doc, removed INSTALLED_FILES code
-
-* Wed Sep 20 2006 Michael DeHaan <mdehaan@redhat.com> - 0.1.1-7
-- Upstream updates
-
-* Fri Sep 15 2006 Michael DeHaan <mdehaan@redhat.com> - 0.1.1-6
-- Make koan own it's directory, add GPL "COPYING" file.
-
-* Wed Aug 16 2006 Michael DeHaan <mdehaan@redhat.com> - 0.1.1-5
-- Spec file tweaks only for FC-Extras
-
-* Thu Jul 20 2006 Michael DeHaan <mdehaan@redhat.com> - 0.1.1-4
-- Fixed python import paths in yaml code, which errantly assumed yaml was installed as a module.
-
-* Wed Jul 12 2006 Michael DeHaan <mdehaan@redhat.com> - 0.1.1-3
-- Added templating support using Cheetah
-
-* Thu Jul 9 2006 Michael DeHaan <mdehaan@redhat.com> - 0.1.0-2
-- Fedora-Extras rpm spec tweaks
-
-* Tue Jun 28 2006 Michael DeHaan <mdehaan@redhat.com> - 0.1.0-1
-- rpm genesis
-
-- 
cgit 


From a05b2e39092d649e6e930880c6d9d555966afe76 Mon Sep 17 00:00:00 2001
From: Michael DeHaan <mdehaan@redhat.com>
Date: Fri, 15 Feb 2008 11:24:19 -0500
Subject: Release bump for 0.8.0

---
 cobbler.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'cobbler.spec')

diff --git a/cobbler.spec b/cobbler.spec
index f33a340..526c754 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -2,7 +2,7 @@
 Summary: Boot server configurator
 Name: cobbler
 AutoReq: no
-Version: 0.7.2
+Version: 0.8.0
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
@@ -190,6 +190,9 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 
 %changelog
 
+- Fri Feb 15 2008 Michael DeHaan <mdehaan@redhat.com> - 0.8.0-1
+- Upstream changes (see CHANGELOG)
+
 * Mon Jan 21 2008 Michael DeHaan <mdehaan@redhat.com> - 0.7.2-1
 - Upstream changes (see CHANGELOG)
 - prune changelog, see git for full
-- 
cgit 


From 64a666bda023f3306f0ad387ec4475397d070da5 Mon Sep 17 00:00:00 2001
From: Michael DeHaan <mdehaan@redhat.com>
Date: Fri, 15 Feb 2008 11:29:06 -0500
Subject: changelog fixup

---
 cobbler.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cobbler.spec')

diff --git a/cobbler.spec b/cobbler.spec
index 526c754..c170d49 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -190,7 +190,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 
 %changelog
 
-- Fri Feb 15 2008 Michael DeHaan <mdehaan@redhat.com> - 0.8.0-1
+* Fri Feb 15 2008 Michael DeHaan <mdehaan@redhat.com> - 0.8.0-1
 - Upstream changes (see CHANGELOG)
 
 * Mon Jan 21 2008 Michael DeHaan <mdehaan@redhat.com> - 0.7.2-1
-- 
cgit 


From 8a7c7a358fe7fa7d2e011853980ad64ccf8cca75 Mon Sep 17 00:00:00 2001
From: Michael DeHaan <mdehaan@redhat.com>
Date: Fri, 15 Feb 2008 12:24:30 -0500
Subject: Fix specfile error

---
 cobbler.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cobbler.spec')

diff --git a/cobbler.spec b/cobbler.spec
index c170d49..246370f 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -183,7 +183,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 
 %defattr(-,root,root)
 %if 0%{?fedora} > 8
-%{python_sitearch}/func*.egg-info
+%{python_sitearch}/cobbler*.egg-info
 %endif
 %doc AUTHORS CHANGELOG README COPYING
 
-- 
cgit 


From a7d67f35019af0c25f133c979112fc6035d7e04c Mon Sep 17 00:00:00 2001
From: Michael DeHaan <mdehaan@redhat.com>
Date: Fri, 15 Feb 2008 13:43:34 -0500
Subject: Specfile fixup

---
 cobbler.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'cobbler.spec')

diff --git a/cobbler.spec b/cobbler.spec
index 246370f..3ef3e8c 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -3,7 +3,7 @@ Summary: Boot server configurator
 Name: cobbler
 AutoReq: no
 Version: 0.8.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
 Group: Applications/System
@@ -183,13 +183,16 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 
 %defattr(-,root,root)
 %if 0%{?fedora} > 8
-%{python_sitearch}/cobbler*.egg-info
+%{python_sitelib}/cobbler*.egg-info
 %endif
 %doc AUTHORS CHANGELOG README COPYING
 
 
 %changelog
 
+* Fri Feb 15 2008 Michael DeHaan <mdehaan@redhat.com> - 0.8.0-2
+- Fix egg packaging
+
 * Fri Feb 15 2008 Michael DeHaan <mdehaan@redhat.com> - 0.8.0-1
 - Upstream changes (see CHANGELOG)
 
-- 
cgit