Skip to content

Commit

Permalink
Merge pull request #279 from essentialkaos/develop
Browse files Browse the repository at this point in the history
Release
  • Loading branch information
andyone authored Sep 23, 2024
2 parents da942e7 + 917a066 commit 8896c86
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 50 deletions.
5 changes: 4 additions & 1 deletion specs/elixir.spec
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

Summary: A modern approach to programming for the Erlang VM
Name: elixir
Version: 1.17.2
Version: 1.17.3
Release: 0%{?dist}
License: ASL 2.0 and ERPL
Group: Development/Tools
Expand Down Expand Up @@ -82,6 +82,9 @@ rm -rf %{buildroot}
################################################################################

%changelog
* Fri Sep 20 2024 Anton Novojilov <[email protected]> - 1.17.3-0
- https://github.com/elixir-lang/elixir/releases/tag/v1.17.3

* Thu Aug 15 2024 Anton Novojilov <[email protected]> - 1.17.2-0
- https://github.com/elixir-lang/elixir/releases/tag/v1.17.2

Expand Down
20 changes: 4 additions & 16 deletions specs/erlang/erlang25.spec
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
%define eprefix %{_prefix}%{_lib32}
%define ver_maj 25
%define ver_min 3
%define ver_patch 2.13
%define ver_patch 2.14
%define ver_suffix %{ver_min}.%{ver_patch}
%define ver_string %{ver_maj}.%{ver_suffix}
%define realname erlang
Expand Down Expand Up @@ -57,13 +57,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ncurses-devel unixODBC-devel tcl-devel make
BuildRequires: tk-devel flex bison gd-devel gd-devel libxslt
BuildRequires: valgrind-devel java-1.8.0-openjdk-devel
BuildRequires: lksctp-tools-devel autoconf

%if 0%{?rhel} <= 7
BuildRequires: devtoolset-11-gcc-c++ devtoolset-11-binutils
%else
BuildRequires: gcc-c++
%endif
BuildRequires: lksctp-tools-devel autoconf gcc-c++

Requires: tk tcl

Expand Down Expand Up @@ -697,9 +691,8 @@ a few bugs in the scanner, and improves HTML export.
################################################################################

%prep
%{crc_check}

%setup -qn otp-OTP-%{ver_string}
%crc_check
%autosetup -n otp-OTP-%{ver_string}

tar xzvf %{SOURCE10}

Expand All @@ -708,11 +701,6 @@ export CFLAGS="%{optflags} -fPIC"
export CXXLAGS=$CFLAGS
export BUILDDIR=$(pwd)

%if 0%{?rhel} <= 7
# Use gcc and gcc-c++ from DevToolSet 11
export PATH="/opt/rh/devtoolset-11/root/usr/bin:$PATH"
%endif

### Static LibreSSL build start ###

pushd libressl-%{libre_ver}
Expand Down
23 changes: 7 additions & 16 deletions specs/erlang/erlang26.spec
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
%define eprefix %{_prefix}%{_lib32}
%define ver_maj 26
%define ver_min 2
%define ver_patch 5.2
%define ver_patch 5.3
%define ver_suffix %{ver_min}.%{ver_patch}
%define ver_string %{ver_maj}.%{ver_suffix}
%define realname erlang
Expand Down Expand Up @@ -57,13 +57,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ncurses-devel unixODBC-devel tcl-devel make
BuildRequires: tk-devel flex bison gd-devel gd-devel libxslt
BuildRequires: valgrind-devel java-1.8.0-openjdk-devel
BuildRequires: lksctp-tools-devel autoconf

%if 0%{?rhel} <= 7
BuildRequires: devtoolset-11-gcc-c++ devtoolset-11-binutils
%else
BuildRequires: gcc-c++
%endif
BuildRequires: lksctp-tools-devel autoconf gcc-c++

Requires: tk tcl

Expand Down Expand Up @@ -697,9 +691,8 @@ a few bugs in the scanner, and improves HTML export.
################################################################################

%prep
%{crc_check}

%setup -qn otp-OTP-%{ver_string}
%crc_check
%autosetup -n otp-OTP-%{ver_string}

tar xzvf %{SOURCE10}

Expand All @@ -708,11 +701,6 @@ export CFLAGS="%{optflags} -fPIC"
export CXXLAGS=$CFLAGS
export BUILDDIR=$(pwd)

%if 0%{?rhel} <= 7
# Use gcc and gcc-c++ from DevToolSet 11
export PATH="/opt/rh/devtoolset-11/root/usr/bin:$PATH"
%endif

### Static LibreSSL build start ###

pushd libressl-%{libre_ver}
Expand Down Expand Up @@ -1033,6 +1021,9 @@ rm -rf %{buildroot}
################################################################################

%changelog
* Fri Sep 20 2024 Anton Novojilov <[email protected]> - 26.2.5.3-0
- https://github.com/erlang/otp/releases/tag/OTP-26.2.5.3

* Sun Aug 04 2024 Anton Novojilov <[email protected]> - 26.2.5.2-0
- https://github.com/erlang/otp/releases/tag/OTP-26.2.5.2

Expand Down
24 changes: 7 additions & 17 deletions specs/erlang/erlang27.spec
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@
%define elibdir %{_libdir}/erlang/lib
%define eprefix %{_prefix}%{_lib32}
%define ver_maj 27
%define ver_min 0
%define ver_patch 1
%define ver_min 1
%define ver_suffix %{ver_min}%{?ver_patch:.%{ver_patch}}
%define ver_string %{ver_maj}.%{ver_suffix}
%define realname erlang
Expand Down Expand Up @@ -57,13 +56,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ncurses-devel unixODBC-devel tcl-devel make
BuildRequires: tk-devel flex bison gd-devel gd-devel libxslt
BuildRequires: valgrind-devel java-1.8.0-openjdk-devel
BuildRequires: lksctp-tools-devel autoconf

%if 0%{?rhel} <= 7
BuildRequires: devtoolset-11-gcc-c++ devtoolset-11-binutils
%else
BuildRequires: gcc-c++
%endif
BuildRequires: lksctp-tools-devel autoconf gcc-c++

Requires: tk tcl

Expand Down Expand Up @@ -683,9 +676,8 @@ a few bugs in the scanner, and improves HTML export.
################################################################################

%prep
%{crc_check}

%setup -qn otp-OTP-%{ver_string}
%crc_check
%autosetup -n otp-OTP-%{ver_string}

tar xzvf %{SOURCE10}

Expand All @@ -694,11 +686,6 @@ export CFLAGS="%{optflags} -fPIC"
export CXXLAGS=$CFLAGS
export BUILDDIR=$(pwd)

%if 0%{?rhel} <= 7
# Use gcc and gcc-c++ from DevToolSet 11
export PATH="/opt/rh/devtoolset-11/root/usr/bin:$PATH"
%endif

### Static LibreSSL build start ###

pushd libressl-%{libre_ver}
Expand Down Expand Up @@ -1015,6 +1002,9 @@ rm -rf %{buildroot}
################################################################################

%changelog
* Fri Sep 20 2024 Anton Novojilov <[email protected]> - 27.1-0
- https://github.com/erlang/otp/releases/tag/OTP-27.1

* Sun Aug 04 2024 Anton Novojilov <[email protected]> - 27.0.1-0
- https://github.com/erlang/otp/releases/tag/OTP-27.0.1

Expand Down

0 comments on commit 8896c86

Please sign in to comment.