diff --git a/erlang.spec b/erlang.spec index 305f759..8058043 100644 --- a/erlang.spec +++ b/erlang.spec @@ -61,7 +61,7 @@ Name: erlang Version: 24.0 -Release: 0.2.rc3%{?dist} +Release: 1%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -69,7 +69,7 @@ URL: https://www.erlang.org %if ! (0%{?rhel} && 0%{?rhel} <= 6) VCS: scm:git:https://github.com/erlang/otp %endif -Source0: https://github.com/erlang/otp/archive/OTP-%{version}-rc3/otp-OTP-%{version}-rc3.tar.gz +Source0: https://github.com/erlang/otp/archive/OTP-%{version}/otp-OTP-%{version}.tar.gz Source5: epmd.service Source6: epmd.socket Source7: epmd@.service @@ -685,7 +685,7 @@ Provides support for XML 1.0. ### END OF AUTOGENERATED LIST ### %prep -%autosetup -p1 -n otp-OTP-%{version}-rc3 +%autosetup -p1 -n otp-OTP-%{version} # FIXME we should come up with a better solution # remove shipped zlib sources @@ -1897,6 +1897,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Wed May 12 2021 Peter Lemenkov - 24.0-1 +- Ver. 24.0 + * Wed Apr 21 2021 Peter Lemenkov - 24.0-0.2.rc3 - Ver. 24.0-rc3 diff --git a/otp-0002-Remove-rpath.patch b/otp-0002-Remove-rpath.patch index be5841a..e55a83c 100644 --- a/otp-0002-Remove-rpath.patch +++ b/otp-0002-Remove-rpath.patch @@ -5,13 +5,13 @@ Subject: [PATCH] Remove rpath Signed-off-by: Peter Lemenkov diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in -index f962b7b9ad..916d23d69c 100644 +index 2eee53bd31..5da20a43a6 100644 --- a/lib/crypto/c_src/Makefile.in +++ b/lib/crypto/c_src/Makefile.in -@@ -125,7 +125,7 @@ TEST_ENGINE_LIB = $(LIBDIR)/otp_test_engine$(TYPEMARKER).@DED_EXT@ - DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@ +@@ -136,7 +136,7 @@ endif + endif - ifeq ($(DYNAMIC_CRYPTO_LIB),yes) + ifeq ($(DYNAMIC_OR_WIN_CRYPTO_LIB),yes) -SSL_DED_LD_RUNTIME_LIBRARY_PATH = @SSL_DED_LD_RUNTIME_LIBRARY_PATH@ +SSL_DED_LD_RUNTIME_LIBRARY_PATH = CRYPTO_LINK_LIB=$(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) -l$(SSL_CRYPTO_LIBNAME) diff --git a/otp-0006-Do-not-install-erlang-sources.patch b/otp-0006-Do-not-install-erlang-sources.patch index 504fd2b..18ef6d6 100644 --- a/otp-0006-Do-not-install-erlang-sources.patch +++ b/otp-0006-Do-not-install-erlang-sources.patch @@ -117,10 +117,10 @@ index 0847da9d5a..24a054ac04 100644 $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/diameter/src/Makefile b/lib/diameter/src/Makefile -index 36e8fefd4c..d3a10890ce 100644 +index 348cc350e1..9d87858def 100644 --- a/lib/diameter/src/Makefile +++ b/lib/diameter/src/Makefile -@@ -263,11 +263,8 @@ release_spec: opt +@@ -260,11 +260,8 @@ release_spec: opt $(MAKE) $(EXAMPLE_DIRS:%/=release_examples_%) $(TARGET_DIRS:%/=release_src_%): release_src_%: diff --git a/sources b/sources index a6d3277..4aad9fe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-24.0-rc3.tar.gz) = bcc4946fafd6fcc0a29d75f8a0168d9db523bec279aaaf4ec3c4b2eb058c6ff6e38459847acf13b7b9327ebbb2c1ea9b28c164e728a004459d89a3e43bf1ea0c +SHA512 (otp-OTP-24.0.tar.gz) = bd3e4dbe640e80dc2173bc9c92178acbd6aee7a486a1eebb7fe8ec70963b8c94bb456af7ac592f434700cd8b1d98ef8351bfc7a76113bbbd0c9a0e20fd68629b