From 4f75dbbe7fddcf42270764e69c685d250e26eb5c Mon Sep 17 00:00:00 2001
From: Ivan Dyachkov <dev@dyachkov.org>
Date: Wed, 15 Feb 2023 10:21:07 +0100
Subject: [PATCH] chore: remove otp version from rpm package name

---
 deploy/packages/rpm/Makefile  | 4 +---
 deploy/packages/rpm/emqx.spec | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/deploy/packages/rpm/Makefile b/deploy/packages/rpm/Makefile
index 67ae7c907..526761380 100644
--- a/deploy/packages/rpm/Makefile
+++ b/deploy/packages/rpm/Makefile
@@ -7,13 +7,12 @@ none :=
 space := $(none) $(none)
 ## RPM does not allow '-' in version number and release string, replace with '_'
 RPM_VSN := $(subst -,_,$(PKG_VSN))
-RPM_REL := otp$(subst -,_,$(OTP_VSN))
 
 EMQX_NAME=$(subst -pkg,,$(EMQX_BUILD))
 
 TAR_PKG_DIR ?= _build/$(EMQX_BUILD)/rel/emqx
 TAR_PKG     := $(EMQX_REL)/$(TAR_PKG_DIR)/emqx-$(PKG_VSN).tar.gz
-SOURCE_PKG  := emqx-$(RPM_VSN)-$(RPM_REL).$(shell uname -m)
+SOURCE_PKG  := emqx-$(RPM_VSN).$(shell uname -m)
 TARGET_PKG  := $(EMQX_NAME)-$(shell $(EMQX_REL)/pkg-vsn.sh $(EMQX_NAME) --long)
 
 # Not $(PWD) as it does not work for make -C
@@ -33,7 +32,6 @@ all: | $(BUILT)
 		--define "_topdir $(TOPDIR)" \
 		--define "_version $(RPM_VSN)" \
 		--define "_reldir $(SRCDIR)" \
-		--define "_release $(RPM_REL)" \
 		--define "_post_addition $(POST_ADDITION)" \
 		--define "_preun_addition $(PREUN_ADDITION)" \
 		--define "_sharedstatedir /var/lib" \
diff --git a/deploy/packages/rpm/emqx.spec b/deploy/packages/rpm/emqx.spec
index 366f85396..b2b58ac23 100644
--- a/deploy/packages/rpm/emqx.spec
+++ b/deploy/packages/rpm/emqx.spec
@@ -5,12 +5,12 @@
 %define _log_dir %{_var}/log/%{_name}
 %define _lib_home /usr/lib/%{_name}
 %define _var_home %{_sharedstatedir}/%{_name}
-%define _build_name_fmt %{_arch}/%{_name}-%{_version}-%{_release}.%{_arch}.rpm
+%define _build_name_fmt %{_arch}/%{_name}-%{_version}.%{_arch}.rpm
 %define _build_id_links none
 
 Name: %{_package_name}
 Version: %{_version}
-Release: %{_release}%{?dist}
+Release: 1%{?dist}
 Summary: emqx
 Group: System Environment/Daemons
 License: Apache License Version 2.0