Merge pull request #104 from essentialkaos/develop

Defs update
essentialkaos · Dec 26, 2023 · 16f22b2 · 16f22b2
2 parents e7a2477 + 08e82e9
commit 16f22b2
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 10 deletions.
diff --git a/SOURCES/defs/3.3-dev → SOURCES/defs/3.3.0 b/SOURCES/defs/3.3-dev → SOURCES/defs/3.3.0
@@ -1,25 +1,26 @@
 # -- [RBdef] --
-# UPDATED 12/Dec/2023 00:34:35 by Anton Novojilov <andy@essentialkaos.com>
+# UPDATED 26/Dec/2023 11:09:56 by Anton Novojilov <andy@essentialkaos.com>
 
-deps(rpm): make gcc gcc-c++ zlib-devel readline-devel tk-devel ca-certificates git
+eol(normal): 2025-03-31
+eol(security): 2026-03-31
+
+deps(rpm): make gcc gcc-c++ zlib-devel readline-devel tk-devel ca-certificates
 deps(rpm): autoconf glibc-devel ncurses-devel bison libffi-devel libyaml-devel
-deps(rpm): rustc
+deps(rpm): rust
 
-deps(deb): build-essential zlib1g-dev libreadline6-dev tk-dev ca-certificates git
+deps(deb): build-essential zlib1g-dev libreadline6-dev tk-dev ca-certificates
 deps(deb): autoconf libc6-dev libncurses5-dev bison libffi-dev libyaml-dev
 deps(deb): rustc
 
-deps(bin): ruby
-
 CONFOPTS(openssl-1.1.1w): {os_name}-{os_arch} --openssldir={prefix}/openssl/ssl zlib-dynamic no-ssl3 shared -fPIC
 PREFIX(openssl-1.1.1w): {prefix}/openssl
 
-CONFOPTS(ruby-3.3): --with-openssl-dir={prefix}/openssl --disable-install-doc
+CONFOPTS(ruby-3.3.0): --with-openssl-dir={prefix}/openssl --disable-install-doc
 
 [default]
   package: "openssl-1.1.1w" "https://www.openssl.org/source/openssl-1.1.1w.tar.gz" "76fbf3ca4370e12894a408ef75718f32cdab9671" openssl
-  git: "ruby-3.3" "https://github.com/ruby/ruby.git" "ruby_3_3" autoconf
+  package: "ruby-3.3.0" "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.0.tar.gz" "1a7e56851bf29bda1183aca99b3b323c58e0187b"
 
 [essentialkaos]
   package: "openssl-1.1.1w" "https://ruby.kaos.st/openssl-1.1.1w.tzst" "e9dcdbc98b9172de70f285f96ace5e5a9f885999" openssl
-  git: "ruby-3.3" "https://github.com/ruby/ruby.git" "ruby_3_3" autoconf
+  package: "ruby-3.3.0" "https://ruby.kaos.st/ruby-3.3.0.tzst" "764abe3dd32b7896e7efe16950c9f66590a2cdce"
diff --git a/SOURCES/defs/3.3.0-jemalloc b/SOURCES/defs/3.3.0-jemalloc
@@ -0,0 +1,21 @@
+# -- [RBdef] --
+# UPDATED 26/Dec/2023 11:09:56 by Anton Novojilov <andy@essentialkaos.com>
+
+eol(normal): 2025-03-31
+eol(security): 2026-03-31
+
+deps(rpm): make gcc gcc-c++ zlib-devel readline-devel tk-devel ca-certificates libyaml-devel
+deps(rpm): autoconf glibc-devel ncurses-devel bison libffi-devel jemalloc-devel rust
+
+CONFOPTS(openssl-1.1.1w): {os_name}-{os_arch} --openssldir={prefix}/openssl/ssl zlib-dynamic no-ssl3 shared -fPIC
+PREFIX(openssl-1.1.1w): {prefix}/openssl
+
+CONFOPTS(ruby-3.3.0): --with-jemalloc --with-openssl-dir={prefix}/openssl --disable-install-doc
+
+[default]
+  package: "openssl-1.1.1w" "https://www.openssl.org/source/openssl-1.1.1w.tar.gz" "76fbf3ca4370e12894a408ef75718f32cdab9671" openssl
+  package: "ruby-3.3.0" "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.0.tar.gz" "1a7e56851bf29bda1183aca99b3b323c58e0187b"
+
+[essentialkaos]
+  package: "openssl-1.1.1w" "https://ruby.kaos.st/openssl-1.1.1w.tzst" "e9dcdbc98b9172de70f285f96ace5e5a9f885999" openssl
+  package: "ruby-3.3.0" "https://ruby.kaos.st/ruby-3.3.0.tzst" "764abe3dd32b7896e7efe16950c9f66590a2cdce"
diff --git a/rbbuild-defs.spec b/rbbuild-defs.spec
@@ -2,7 +2,7 @@
 
 Summary:    Def files for rbbuild utility
 Name:       rbbuild-defs
-Version:    2.0.5
+Version:    2.0.6
 Release:    0%{?dist}
 License:    Apache License, Version 2.0
 Vendor:     ESSENTIAL KAOS
@@ -51,6 +51,10 @@ rm -rf %{buildroot}
 ################################################################################
 
 %changelog
+* Tue Dec 26 2023 Anton Novojilov <andy@essentialkaos.com> - 2.0.6-0
+- Added 3.3.0
+- Added 3.3.0-jemalloc
+
 * Mon Dec 11 2023 Anton Novojilov <andy@essentialkaos.com> - 2.0.5-0
 - Added jruby-9.3.11.0
 - Added jruby-9.3.12.0