diff --git a/erlang.spec b/erlang.spec index 224358d..ba482ed 100644 --- a/erlang.spec +++ b/erlang.spec @@ -67,7 +67,7 @@ Name: erlang -Version: 25.0.4 +Version: 25.1 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -108,7 +108,6 @@ Patch6: otp-0006-Do-not-install-erlang-sources.patch Patch7: otp-0007-Add-extra-search-directory.patch Patch8: otp-0008-Avoid-forking-sed-to-get-basename.patch Patch9: otp-0009-Load-man-pages-from-system-wide-directory.patch -Patch10: otp-0010-Specify-encoding-during-javadoc-stage.patch # end of autogenerated patch tag list BuildRequires: gcc @@ -1916,6 +1915,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Wed Sep 21 2022 Peter Lemenkov - 25.1-1 +- Ver. 25.1 + * Thu Aug 18 2022 Peter Lemenkov - 25.0.4-1 - Ver. 25.0.4 diff --git a/otp-0002-Remove-rpath.patch b/otp-0002-Remove-rpath.patch index de2d7a1..b906050 100644 --- a/otp-0002-Remove-rpath.patch +++ b/otp-0002-Remove-rpath.patch @@ -5,10 +5,10 @@ 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 ec5cb32973..429347a07e 100644 +index 25167a8a3a..2345970fa9 100644 --- a/lib/crypto/c_src/Makefile.in +++ b/lib/crypto/c_src/Makefile.in -@@ -146,7 +146,7 @@ endif +@@ -147,7 +147,7 @@ endif endif ifeq ($(DYNAMIC_OR_WIN_CRYPTO_LIB),yes) diff --git a/otp-0006-Do-not-install-erlang-sources.patch b/otp-0006-Do-not-install-erlang-sources.patch index e96c821..e40945b 100644 --- a/otp-0006-Do-not-install-erlang-sources.patch +++ b/otp-0006-Do-not-install-erlang-sources.patch @@ -8,10 +8,10 @@ Signed-off-by: Peter Lemenkov Signed-off-by: Hans Ulrich Niedermann diff --git a/erts/preloaded/src/Makefile b/erts/preloaded/src/Makefile -index 191341a9f5..35c884e933 100644 +index 1994aa1302..007b7d44bd 100644 --- a/erts/preloaded/src/Makefile +++ b/erts/preloaded/src/Makefile -@@ -113,8 +113,6 @@ $(APP_TARGET): $(APP_SRC) $(ERL_TOP)/erts/vsn.mk +@@ -117,8 +117,6 @@ $(APP_TARGET): $(APP_SRC) $(ERL_TOP)/erts/vsn.mk include $(ERL_TOP)/make/otp_release_targets.mk release_spec: $(APP_TARGET) @@ -21,10 +21,10 @@ index 191341a9f5..35c884e933 100644 $(INSTALL_DATA) $(STATIC_TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/asn1/src/Makefile b/lib/asn1/src/Makefile -index 6d02075576..15f7054fed 100644 +index 9e13d02c8a..77ba98c2f8 100644 --- a/lib/asn1/src/Makefile +++ b/lib/asn1/src/Makefile -@@ -151,7 +151,7 @@ release_spec: opt +@@ -157,7 +157,7 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -63,10 +63,10 @@ index 4ff5e678ee..4e3fa5c60f 100644 $(INSTALL_SCRIPT) $(PROGRAMS) "$(RELEASE_PATH)/test_server" diff --git a/lib/compiler/src/Makefile b/lib/compiler/src/Makefile -index a9027b3ad8..3aaadb8500 100644 +index d801d6baa0..4eed19b516 100644 --- a/lib/compiler/src/Makefile +++ b/lib/compiler/src/Makefile -@@ -182,8 +182,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -188,8 +188,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -117,11 +117,11 @@ index c934ecdc2b..cc266f48e2 100644 $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/diameter/src/Makefile b/lib/diameter/src/Makefile -index 6dd3667a46..4e37212caa 100644 +index 75e23d4191..7097541548 100644 --- a/lib/diameter/src/Makefile +++ b/lib/diameter/src/Makefile -@@ -260,11 +260,8 @@ release_spec: opt - $(MAKE) $(EXAMPLE_DIRS:%/=release_examples_%) +@@ -266,11 +266,8 @@ release_spec: opt + $(MAKE) ERL_DETERMINISTIC=$(ERL_DETERMINISTIC) $(EXAMPLE_DIRS:%/=release_examples_%) $(TARGET_DIRS:%/=release_src_%): release_src_%: - $(INSTALL_DIR) "$(RELSYSDIR)/src/$*" @@ -422,10 +422,10 @@ index c7971750a7..f6024f1184 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/include" diff --git a/lib/public_key/asn1/Makefile b/lib/public_key/asn1/Makefile -index d33e13fb14..dfa35c6ef2 100644 +index c1adf58ed4..bba7cae5d6 100644 --- a/lib/public_key/asn1/Makefile +++ b/lib/public_key/asn1/Makefile -@@ -99,8 +99,6 @@ release_spec: opt +@@ -103,8 +103,6 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/asn1" $(INSTALL_DATA) $(ASN_ASNS) $(ASN_CONFIGS) \ "$(RELSYSDIR)/asn1" @@ -485,11 +485,11 @@ index 490e03595d..739830ae3f 100644 $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" -diff --git a/lib/snmp/src/agent/Makefile b/lib/snmp/src/agent/Makefile -index 815b9f16cc..1eb49e9b93 100644 ---- a/lib/snmp/src/agent/Makefile -+++ b/lib/snmp/src/agent/Makefile -@@ -151,7 +151,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +diff --git a/lib/snmp/src/agent/Makefile.in b/lib/snmp/src/agent/Makefile.in +index 6ab9ed437a..14ae0bbc79 100644 +--- a/lib/snmp/src/agent/Makefile.in ++++ b/lib/snmp/src/agent/Makefile.in +@@ -161,7 +161,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/src/agent" @@ -512,10 +512,10 @@ index f5a74aa78e..0340088eb3 100644 $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ "$(RELSYSDIR)/ebin" diff --git a/lib/snmp/src/compile/Makefile b/lib/snmp/src/compile/Makefile -index d37eaf9636..5d10c1250e 100644 +index f255237a04..04232658c7 100644 --- a/lib/snmp/src/compile/Makefile +++ b/lib/snmp/src/compile/Makefile -@@ -137,7 +137,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -141,7 +141,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/src/compiler" @@ -577,10 +577,10 @@ index 789bed5c3f..9cd7f7226c 100644 $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/stdlib/src/Makefile b/lib/stdlib/src/Makefile -index 369a448fe5..f23e53fd6f 100644 +index 761d6c4c28..43e7a650a5 100644 --- a/lib/stdlib/src/Makefile +++ b/lib/stdlib/src/Makefile -@@ -223,7 +223,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -230,7 +230,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -644,10 +644,10 @@ index ce14c0b6df..f052399c0f 100644 $(INSTALL_DATA) $(EXT_HRL) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" diff --git a/lib/xmerl/src/Makefile b/lib/xmerl/src/Makefile -index 0a9f8391c7..2ff364c678 100644 +index e7e7c8e978..37b7843605 100644 --- a/lib/xmerl/src/Makefile +++ b/lib/xmerl/src/Makefile -@@ -218,9 +218,7 @@ release_spec: opt +@@ -223,9 +223,7 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/src" diff --git a/otp-0010-Specify-encoding-during-javadoc-stage.patch b/otp-0010-Specify-encoding-during-javadoc-stage.patch deleted file mode 100644 index 756bea4..0000000 --- a/otp-0010-Specify-encoding-during-javadoc-stage.patch +++ /dev/null @@ -1,19 +0,0 @@ -From: Peter Lemenkov -Date: Wed, 13 Jul 2022 20:51:47 +0200 -Subject: [PATCH] Specify encoding during javadoc stage - -Signed-off-by: Peter Lemenkov - -diff --git a/lib/jinterface/doc/src/Makefile b/lib/jinterface/doc/src/Makefile -index 47e269a273..3e329a3a3f 100644 ---- a/lib/jinterface/doc/src/Makefile -+++ b/lib/jinterface/doc/src/Makefile -@@ -74,7 +74,7 @@ JAVA_SRC_FILES = $(JAVA_FILES:%=$(JAVA_SRC_PATH)/%.java) - - - ../html/java/index.html: $(JAVA_SRC_FILES) -- (cd ../../java_src;$(JAVADOC) -sourcepath . -d $(JAVADOC_DEST) \ -+ (cd ../../java_src;$(JAVADOC) -encoding UTF-8 -sourcepath . -d $(JAVADOC_DEST) \ - -windowtitle $(JAVADOC_TITLE) $(JAVADOC_PKGS)) - - html: ../html/java/index.html diff --git a/sources b/sources index 5502eef..a592ad1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-25.0.4.tar.gz) = 8d9d12496d55181c0d866bbd97576551d1d78232fe34b845e8efbfbd4e95ce8426e73221d8126d12453959cd8adc5e07f121aaa93f3a5696074b43c69291d363 +SHA512 (otp-OTP-25.1.tar.gz) = d9ad3f41a01121ce1e299ce3532a4bb498bb804a28ea01715cdda3308a89d84ebe14ad3da421a400e403ccb218fb8b3b708344ff10fcfd9e3b28286cac85d81a