File rabbitmq-server-release-3.6.16-git.patch of Package rabbitmq-server

diff --git a/Makefile b/Makefile
index c8920c2..d9ed830 100644
--- a/Makefile
+++ b/Makefile
@@ -35,7 +35,7 @@ include erlang.mk
 .PHONY: source-dist clean-source-dist
 
 SOURCE_DIST_BASE ?= rabbitmq-server
-SOURCE_DIST_SUFFIXES ?= tar.xz zip
+SOURCE_DIST_SUFFIXES ?= tar.xz
 SOURCE_DIST ?= $(PACKAGES_DIR)/$(SOURCE_DIST_BASE)-$(PROJECT_VERSION)
 
 # The first source distribution file is used by packages: if the archive
diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec
index 95c0873..5fd3042 100644
--- a/packaging/RPMS/Fedora/rabbitmq-server.spec
+++ b/packaging/RPMS/Fedora/rabbitmq-server.spec
@@ -1,9 +1,10 @@
 %define debug_package %{nil}
 %define erlang_minver R16B-03
+%define erlang_maxver 21.0
 
 Name: rabbitmq-server
 Version: %%VERSION%%
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MPLv1.1 and MIT and ASL 2.0 and BSD
 Group: %{group_tag}
 Source: http://www.rabbitmq.com/releases/rabbitmq-server/v%{upstream_version}/%{name}-%{upstream_version}.tar.xz
@@ -13,13 +14,13 @@ Source3: rabbitmq-server.service
 Source4: rabbitmq-server.tmpfiles
 URL: http://www.rabbitmq.com/
 BuildArch: noarch
-BuildRequires: erlang >= %{erlang_minver}, python-simplejson, xmlto, libxslt, gzip, sed, zip, rsync
+BuildRequires: erlang >= %{erlang_minver}, erlang < %{erlang_maxver}, python-simplejson, xmlto, libxslt, gzip, sed, zip, rsync
 
 %if 0%{?fedora} || 0%{?rhel} >= 7 || 0%{?suse_version} >= 1315
 BuildRequires:  systemd
 %endif
 
-Requires: erlang >= %{erlang_minver}, logrotate, socat
+Requires: erlang >= %{erlang_minver}, erlang < %{erlang_maxver}, logrotate, socat
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-%{_arch}-root
 Summary: The RabbitMQ server
 
@@ -203,6 +204,9 @@ systemctl try-restart %{name}.service >/dev/null 2>&1 || :
 rm -rf %{buildroot}
 
 %changelog
+* Tue Sep 04 2018 info@rabbitmq.com 3.6.16-2
+- Add an upper limit for the range of compatible Erlang versions, marking Erlang 21 as incompatible.
+
 * Wed Jun 13 2018 info@rabbitmq.com 3.6.16-1
 - New upstream release.
 
diff --git a/packaging/RPMS/Fedora/scripts/update-changelog.sh b/packaging/RPMS/Fedora/scripts/update-changelog.sh
index 318a90d..52043dc 100755
--- a/packaging/RPMS/Fedora/scripts/update-changelog.sh
+++ b/packaging/RPMS/Fedora/scripts/update-changelog.sh
@@ -23,7 +23,7 @@ if test -z "$SPEC" -o ! -f "$SPEC" -o -z "$PACKAGE_VERSION"; then
 fi
 
 if "$SCRIPTS_DIR/parse-changelog.sh" "$SPEC" | \
- grep -E -q "^\*.+ ${PACKAGE_VERSION}-[^ ]+$" "$SPEC"; then
+ grep -E -q "^\*.+ ${PACKAGE_VERSION}-[^ ]+$"; then
   exit 0
 fi
 
diff --git a/packaging/debs/Debian/debian/changelog b/packaging/debs/Debian/debian/changelog
index 7b934a3..4438212 100644
--- a/packaging/debs/Debian/debian/changelog
+++ b/packaging/debs/Debian/debian/changelog
@@ -1,3 +1,10 @@
+rabbitmq-server (3.6.16-2) unstable; urgency=low
+
+  * Add an upper limit for the range of compatible Erlang versions, marking
+    Erlang 21 as incompatible.
+
+ -- RabbitMQ Team <info@rabbitmq.com>  Tue, 04 Sep 2018 15:30:01 +0200
+
 rabbitmq-server (3.6.16-1) unstable; urgency=low
 
   * New Upstream Release.
diff --git a/packaging/debs/Debian/debian/control b/packaging/debs/Debian/debian/control
index 9002ec6..6b2b0aa 100644
--- a/packaging/debs/Debian/debian/control
+++ b/packaging/debs/Debian/debian/control
@@ -10,9 +10,42 @@ Build-Depends: debhelper (>= 9),
  python-simplejson,
  xmlto,
  xsltproc,
- erlang-nox (>= 1:16.b.3-3) | esl-erlang (>= 1:16.b.3-2),
- erlang-dev (>= 1:16.b.3-3) | esl-erlang (>= 1:16.b.3-2),
- erlang-src (>= 1:16.b.3-3) | esl-erlang (>= 1:16.b.3-2),
+ erlang-base (>= 1:16.b.3) | erlang-base-hipe (>= 1:16.b.3) | esl-erlang (>= 1:16.b.3),
+ erlang-base (<< 1:21)   | erlang-base-hipe (<< 1:21)   | esl-erlang (<< 1:21),
+ erlang-crypto (>= 1:16.b.3) | esl-erlang (>= 1:16.b.3),
+ erlang-crypto (<< 1:21)   | esl-erlang (<< 1:21),
+ erlang-edoc (>= 1:16.b.3) | esl-erlang (>= 1:16.b.3),
+ erlang-edoc (<< 1:21)   | esl-erlang (<< 1:21),
+ erlang-eldap (>= 1:16.b.3) | esl-erlang (>= 1:16.b.3),
+ erlang-eldap (<< 1:21)   | esl-erlang (<< 1:21),
+ erlang-erl-docgen (>= 1:16.b.3) | esl-erlang (>= 1:16.b.3),
+ erlang-erl-docgen (<< 1:21)   | esl-erlang (<< 1:21),
+ erlang-eunit (>= 1:16.b.3) | esl-erlang (>= 1:16.b.3),
+ erlang-eunit (<< 1:21)   | esl-erlang (<< 1:21),
+ erlang-inets (>= 1:16.b.3) | esl-erlang (>= 1:16.b.3),
+ erlang-inets (<< 1:21)   | esl-erlang (<< 1:21),
+ erlang-mnesia (>= 1:16.b.3) | esl-erlang (>= 1:16.b.3),
+ erlang-mnesia (<< 1:21)   | esl-erlang (<< 1:21),
+ erlang-os-mon (>= 1:16.b.3) | esl-erlang (>= 1:16.b.3),
+ erlang-os-mon (<< 1:21)   | esl-erlang (<< 1:21),
+ erlang-parsetools (>= 1:16.b.3) | esl-erlang (>= 1:16.b.3),
+ erlang-parsetools (<< 1:21)   | esl-erlang (<< 1:21),
+ erlang-public-key (>= 1:16.b.3) | esl-erlang (>= 1:16.b.3),
+ erlang-public-key (<< 1:21)   | esl-erlang (<< 1:21),
+ erlang-runtime-tools (>= 1:16.b.3) | esl-erlang (>= 1:16.b.3),
+ erlang-runtime-tools (<< 1:21)   | esl-erlang (<< 1:21),
+ erlang-ssl (>= 1:16.b.3) | esl-erlang (>= 1:16.b.3),
+ erlang-ssl (<< 1:21)   | esl-erlang (<< 1:21),
+ erlang-syntax-tools (>= 1:16.b.3) | esl-erlang (>= 1:16.b.3),
+ erlang-syntax-tools (<< 1:21)   | esl-erlang (<< 1:21),
+ erlang-tools (>= 1:16.b.3) | esl-erlang (>= 1:16.b.3),
+ erlang-tools (<< 1:21)   | esl-erlang (<< 1:21),
+ erlang-xmerl (>= 1:16.b.3) | esl-erlang (>= 1:16.b.3),
+ erlang-xmerl (<< 1:21)   | esl-erlang (<< 1:21),
+ erlang-dev (>= 1:16.b.3) | esl-erlang (>= 1:16.b.3),
+ erlang-dev (<< 1:21)   | esl-erlang (<< 1:21),
+ erlang-src (>= 1:16.b.3) | esl-erlang (>= 1:16.b.3),
+ erlang-src (<< 1:21)   | esl-erlang (<< 1:21),
  zip,
  rsync
 Standards-Version: 3.9.6
@@ -24,7 +57,32 @@ Architecture: all
 # Debian, where dh-systemd/init-system-helpers is at version 1.18, but
 # Ubuntu 14.04 only has init-system-helpers 1.14.
 Depends: init-system-helpers (>= 1.13~),
- erlang-nox (>= 1:16.b.3) | esl-erlang (>= 1:16.b.3),
+ erlang-base (>= 1:16.b.3) | erlang-base-hipe (>= 1:16.b.3) | esl-erlang (>= 1:16.b.3),
+ erlang-base (<< 1:21)   | erlang-base-hipe (<< 1:21)   | esl-erlang (<< 1:21),
+ erlang-crypto (>= 1:16.b.3) | esl-erlang (>= 1:16.b.3),
+ erlang-crypto (<< 1:21)   | esl-erlang (<< 1:21),
+ erlang-eldap (>= 1:16.b.3) | esl-erlang (>= 1:16.b.3),
+ erlang-eldap (<< 1:21)   | esl-erlang (<< 1:21),
+ erlang-inets (>= 1:16.b.3) | esl-erlang (>= 1:16.b.3),
+ erlang-inets (<< 1:21)   | esl-erlang (<< 1:21),
+ erlang-mnesia (>= 1:16.b.3) | esl-erlang (>= 1:16.b.3),
+ erlang-mnesia (<< 1:21)   | esl-erlang (<< 1:21),
+ erlang-os-mon (>= 1:16.b.3) | esl-erlang (>= 1:16.b.3),
+ erlang-os-mon (<< 1:21)   | esl-erlang (<< 1:21),
+ erlang-parsetools (>= 1:16.b.3) | esl-erlang (>= 1:16.b.3),
+ erlang-parsetools (<< 1:21)   | esl-erlang (<< 1:21),
+ erlang-public-key (>= 1:16.b.3) | esl-erlang (>= 1:16.b.3),
+ erlang-public-key (<< 1:21)   | esl-erlang (<< 1:21),
+ erlang-runtime-tools (>= 1:16.b.3) | esl-erlang (>= 1:16.b.3),
+ erlang-runtime-tools (<< 1:21)   | esl-erlang (<< 1:21),
+ erlang-ssl (>= 1:16.b.3) | esl-erlang (>= 1:16.b.3),
+ erlang-ssl (<< 1:21)   | esl-erlang (<< 1:21),
+ erlang-syntax-tools (>= 1:16.b.3) | esl-erlang (>= 1:16.b.3),
+ erlang-syntax-tools (<< 1:21)   | esl-erlang (<< 1:21),
+ erlang-tools (>= 1:16.b.3) | esl-erlang (>= 1:16.b.3),
+ erlang-tools (<< 1:21)   | esl-erlang (<< 1:21),
+ erlang-xmerl (>= 1:16.b.3) | esl-erlang (>= 1:16.b.3),
+ erlang-xmerl (<< 1:21)   | esl-erlang (<< 1:21),
  adduser,
  logrotate,
  socat
diff --git a/packaging/debs/Debian/scripts/update-changelog.sh b/packaging/debs/Debian/scripts/update-changelog.sh
index 0f5e793..70076bf 100755
--- a/packaging/debs/Debian/scripts/update-changelog.sh
+++ b/packaging/debs/Debian/scripts/update-changelog.sh
@@ -10,11 +10,14 @@ if test -z "$PACKAGE_VERSION"; then
 fi
 
 PACKAGE_NAME=$(awk '/^Source:/ { print $2; }' < debian/control)
-CHANGELOG_VERSION=$(dpkg-parsechangelog | sed -n 's/^Version: \(.*\)-[^-]*$/\1/p')
 CHANGELOG_DATE=$(date -R)
 
-if [ "${CHANGELOG_VERSION}" != "${PACKAGE_VERSION}" ]; then
-  cat > debian/changelog.tmp <<EOF
+if dpkg-parsechangelog --all | \
+ grep -E -q "^ $PACKAGE_NAME \(${PACKAGE_VERSION}-[^)]\) "; then
+  exit 0
+fi
+
+cat > debian/changelog.tmp <<EOF
 ${PACKAGE_NAME} (${PACKAGE_VERSION}-1) unstable; urgency=low
 
   * New Upstream Release.
@@ -23,9 +26,8 @@ ${PACKAGE_NAME} (${PACKAGE_VERSION}-1) unstable; urgency=low
 
 EOF
 
-  cat debian/changelog >> debian/changelog.tmp
-  mv -f debian/changelog.tmp debian/changelog
-fi
+cat debian/changelog >> debian/changelog.tmp
+mv -f debian/changelog.tmp debian/changelog
 
 echo
 echo '--------------------------------------------------'