summaryrefslogtreecommitdiffstats
path: root/cobbler.spec
diff options
context:
space:
mode:
Diffstat (limited to 'cobbler.spec')
-rw-r--r--cobbler.spec13
1 files changed, 11 insertions, 2 deletions
diff --git a/cobbler.spec b/cobbler.spec
index a84d634..070bff3 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -2,8 +2,8 @@
Summary: Boot server configurator
Name: cobbler
AutoReq: no
-Version: 0.8.3
-Release: 2%{?dist}
+Version: 0.9.0
+Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
License: GPLv2+
Group: Applications/System
@@ -128,6 +128,7 @@ 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/users.conf
%dir %{python_sitelib}/cobbler
%dir %{python_sitelib}/cobbler/yaml
%dir %{python_sitelib}/cobbler/modules
@@ -190,7 +191,15 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
%changelog
+<<<<<<< HEAD:cobbler.spec
+* Tue Apr 08 2008 Michael DeHaan <mdehaan@redhat.com> - 0.9.0-1
+- Upstream changes (see CHANGELOG)
+- packaged /etc/cobbler/users.conf
+
+* Tue Apr 08 2008 Michael DeHaan <mdehaan@redhat.com> - 0.8.3-1
+=======
* Tue Apr 08 2008 Michael DeHaan <mdehaan@redhat.com> - 0.8.3-2
+>>>>>>> master:cobbler.spec
- Upstream changes (see CHANGELOG)
* Fri Mar 07 2008 Michael DeHaan <mdehaan@redhat.com> - 0.8.2-1