summaryrefslogtreecommitdiffstats
path: root/cobbler.spec
diff options
context:
space:
mode:
authorMichael DeHaan <mdehaan@redhat.com>2008-02-15 14:54:25 -0500
committerMichael DeHaan <mdehaan@redhat.com>2008-02-15 14:54:25 -0500
commita47ee22ab684eed992128b60b136fca90ff9f119 (patch)
treecd55daf8057049368b4aaa6d23c30408eae411d2 /cobbler.spec
parent70bfc8f5a3150d09cc064a4c46efcaff80b29904 (diff)
parenta7d67f35019af0c25f133c979112fc6035d7e04c (diff)
downloadthird_party-cobbler-a47ee22ab684eed992128b60b136fca90ff9f119.zip
third_party-cobbler-a47ee22ab684eed992128b60b136fca90ff9f119.tar.gz
third_party-cobbler-a47ee22ab684eed992128b60b136fca90ff9f119.tar.xz
Merge branch 'devel'
Merging devel work on 0.7.X/0.8 release with master Conflicts: CHANGELOG cobbler.spec cobbler/action_import.py cobbler/utils.py cobbler/webui/master.py setup.py
Diffstat (limited to 'cobbler.spec')
-rw-r--r--cobbler.spec164
1 files changed, 33 insertions, 131 deletions
diff --git a/cobbler.spec b/cobbler.spec
index 5989399..13873a8 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -1,8 +1,9 @@
%{!?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.5
-Release: 3%{?dist}
+AutoReq: no
+Version: 0.8.0
+Release: 2%{?dist}
Source0: %{name}-%{version}.tar.gz
License: GPLv2+
Group: Applications/System
@@ -14,9 +15,7 @@ Requires: createrepo
Requires: mod_python
Requires: python-cheetah
Requires: rhpl
-%ifarch i386 i686 x86_64
-Requires: syslinux
-%endif
+Requires: rsync
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/chkconfig
Requires(preun): /sbin/service
@@ -83,13 +82,10 @@ 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/findks.cgi
-/var/www/cgi-bin/cobbler/nopxe.cgi
-/var/www/cgi-bin/cobbler/webui.cgi
-%defattr(660,apache,apache)
-%config(noreplace) /var/www/cgi-bin/cobbler/.htaccess
-%config(noreplace) /var/www/cgi-bin/cobbler/.htpasswd
+/var/www/cgi-bin/cobbler/*.cgi
%defattr(755,apache,apache)
%dir /usr/share/cobbler/webui_templates
@@ -125,27 +121,20 @@ 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
-%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
-%config(noreplace) /etc/cobbler/webui-cherrypy.cfg
%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*
%{_mandir}/man1/cobbler.1.gz
@@ -175,6 +164,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)
@@ -185,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
@@ -200,12 +190,27 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
%changelog
-* Thu Jan 10 2008 Michael DeHaan <mdehaan@redhat.com> - 0.6.5-3
-- added python-setuptools stanza for F9
+* 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)
+
+* Mon Jan 21 2008 Michael DeHaan <mdehaan@redhat.com> - 0.7.2-1
+- Upstream changes (see CHANGELOG)
+- prune changelog, see git for full
-* Thu Jan 10 2008 Michael DeHaan <mdehaan@redhat.com> - 0.6.5-1
+* Mon Jan 07 2008 Michael DeHaan <mdehaan@redhat.com> - 0.7.1-1
- Upstream changes (see CHANGELOG)
-- simplify directory permissions
+- 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
+- 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
- Upstream changes (see CHANGELOG)
@@ -287,106 +292,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
-