X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=cobbler.spec;h=ef214d6c7d1ae7fb2e3b8de4e7ce33318ba0e3cf;hb=f322dd5d548d02bffa6c80279924f7571441eb52;hp=92047a93b3cddb13333a94d958f857f3325f3bb5;hpb=de4de048eb48a91e1dc67bc8d68887173dfd0939;p=packages%2Fcentos7%2Fcobbler.git

diff --git a/cobbler.spec b/cobbler.spec
index 92047a9..ef214d6 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -16,7 +16,7 @@ Name: cobbler
 License: GPLv2+
 AutoReq: no
 Version: 2.6.9
-Release: 1%{?dist}~mos8.0.1
+Release: 1%{?dist}~mos11
 Source0: https://github.com/cobbler/cobbler/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 # Support newer virt-install - https://bugzilla.redhat.com/show_bug.cgi?id=1188424
 Patch0: cobbler-virtinstall.patch
@@ -26,6 +26,11 @@ Patch1: cobbler-centos.patch
 # Support django1.7+
 # https://github.com/cobbler/cobbler-web/issues/9
 Patch2: cobbler-django17.patch
+# Add ALLOWED_HOSTS into djando settings
+Patch3: Mirantis-Add-ALLOWED_HOSTS-for-settings.patch
+# Add signatures for Ubuntu 16.04 and Fedora 24
+Patch4: Mirantis-Signatures-for-Ubuntu-16.04-and-Fedora-24.patch
+
 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
@@ -87,8 +92,10 @@ other applications.
 %patch0 -p1 -b .virtinstall
 %patch1 -p1 -b .centos
 # django 1.8 on Fedora 22+
-%if 0%{?fedora} >= 22
+%if 0%{?fedora} >= 22 || 0%{?rhel} >= 6
 %patch2 -p1 -b .django17
+%patch3 -p1
+%patch4 -p1
 %endif
 
 %build
@@ -284,6 +291,17 @@ sed -i -e "s/SECRET_KEY = ''/SECRET_KEY = \'$RAND_SECRET\'/" /usr/share/cobbler/
 
 
 %changelog
+* Tue Jun 13 2016 Dmitry Teselkkin <mos-linux-team@mirantis.com> - 2.6.9-1~mos11
+- Add patch to add signatures for Ubuntu 16.04
+
+* Thu May 19 2016 Ivan Suzdal <mos-linux-team@mirantis.com> - 2.6.9-1~mos10
+- Add patch to fix 'error 400' for cobbler-web (LP: #1583648)
+- Bump version
+
+* Thu Feb 11 2016 Ivan Suzdal <isuzdal@mirantis.com> - 2.6.9-1~mos9
+- Add 'rhel' condition for django17 path
+- Bump version
+
 * Tue Sep 29 2015 Artem Silenkov <asilenkov@mirantis.com> - 2.6.9-1~mos8.0.1
 - Make sources local
 - Rebuild from epel7