summaryrefslogtreecommitdiffstats
path: root/cobbler.spec
diff options
context:
space:
mode:
authorMichael DeHaan <mdehaan@redhat.com>2008-05-29 12:13:02 -0400
committerMichael DeHaan <mdehaan@redhat.com>2008-05-29 12:13:02 -0400
commitc229ab1045d0d0668984d09026c6de74ec74eb33 (patch)
tree37c93be056ef1b57189a73cab21327d54c782cad /cobbler.spec
parent70aafe12b4e05038bd52c38c33368b8d9ce48ea4 (diff)
parent59ecc2ebecdf10d46db2b8606b25a16c46c74e64 (diff)
downloadthird_party-cobbler-c229ab1045d0d0668984d09026c6de74ec74eb33.zip
third_party-cobbler-c229ab1045d0d0668984d09026c6de74ec74eb33.tar.gz
third_party-cobbler-c229ab1045d0d0668984d09026c6de74ec74eb33.tar.xz
Merge branch 'master' into devel
Conflicts: CHANGELOG cobbler.spec setup.py
Diffstat (limited to 'cobbler.spec')
-rw-r--r--cobbler.spec9
1 files changed, 5 insertions, 4 deletions
diff --git a/cobbler.spec b/cobbler.spec
index 111072d..6819e42 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -110,9 +110,6 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
/var/www/cobbler/webui/*.js
/var/www/cobbler/webui/*.png
/var/www/cobbler/webui/*.html
-%defattr(-,root,root)
-%dir /tftpboot/pxelinux.cfg
-%dir /tftpboot/images
%{_bindir}/cobbler
%{_bindir}/cobblerd
%dir /etc/cobbler
@@ -188,9 +185,13 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
%changelog
-* Wed May 27 2008 Michael DeHaan <mdehaan@redhat.com> - 1.1.0-1
+* Thu May 28 2008 Michael DeHaan <mdehaan@redhat.com> - 1.1.0-1
- Upstream chnages (see CHANGELOG)
+* Thu May 28 2008 Michael DeHaan <mdehaan@redhat.com> - 1.0.1-1
+- Upstream changes (see CHANGELOG)
+- stop owning files in tftpboot
+
* Wed May 27 2008 Michael DeHaan <mdehaan@redhat.com> - 1.0.0-2
- Upstream changes (see CHANGELOG)