Added spec fixes
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
--- ruby.spec 2024-09-19 12:10:18.000000000 +0300
|
--- ruby.spec 2024-09-19 12:10:18.000000000 +0300
|
||||||
+++ alt-brepo-ruby33.spec 2024-10-23 16:30:01.059641143 +0300
|
+++ alt-brepo-ruby33.spec 2024-10-23 22:15:18.460992219 +0300
|
||||||
@@ -1,3 +1,14 @@
|
@@ -1,3 +1,14 @@
|
||||||
+%define __brp_check_rpaths %{nil}
|
+%define __brp_check_rpaths %{nil}
|
||||||
+%define __arch_install_post %{nil}
|
+%define __arch_install_post %{nil}
|
||||||
@@ -24,7 +24,7 @@
|
|||||||
|
|
||||||
# If revision and milestone are removed/commented out, the official release build is expected.
|
# If revision and milestone are removed/commented out, the official release build is expected.
|
||||||
%if 0%{?milestone:1}%{?revision:1} != 0
|
%if 0%{?milestone:1}%{?revision:1} != 0
|
||||||
@@ -164,8 +175,10 @@
|
@@ -164,10 +175,12 @@
|
||||||
%bcond_without hardening_test
|
%bcond_without hardening_test
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
@@ -34,8 +34,22 @@
|
|||||||
-Name: ruby
|
-Name: ruby
|
||||||
+Name: alt-brepo-ruby33
|
+Name: alt-brepo-ruby33
|
||||||
Version: %{ruby_version}%{?development_release}
|
Version: %{ruby_version}%{?development_release}
|
||||||
Release: 3%{?dist}
|
-Release: 3%{?dist}
|
||||||
|
+Release: 3%{?dist}.brepo.1
|
||||||
# Licenses, which are likely not included in binary RPMs:
|
# Licenses, which are likely not included in binary RPMs:
|
||||||
|
# Apache-2.0:
|
||||||
|
# benchmark/gc/redblack.rb
|
||||||
|
@@ -287,8 +300,8 @@ Patch14: rubygems-3.5.17-Remove-the-lock
|
||||||
|
|
||||||
|
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
||||||
|
%{?with_rubypick:Suggests: rubypick}
|
||||||
|
-Recommends: ruby(rubygems) >= %{rubygems_version}
|
||||||
|
-Recommends: rubygem(bigdecimal) >= %{bigdecimal_version}
|
||||||
|
+Recommends: %{name}-ruby(rubygems) >= %{rubygems_version}
|
||||||
|
+Recommends: %{name}-rubygem(bigdecimal) >= %{bigdecimal_version}
|
||||||
|
|
||||||
|
BuildRequires: rpm-local-generator-support
|
||||||
|
# Build dependencies
|
||||||
@@ -300,9 +313,9 @@ BuildRequires: libyaml-devel
|
@@ -300,9 +313,9 @@ BuildRequires: libyaml-devel
|
||||||
BuildRequires: openssl-devel
|
BuildRequires: openssl-devel
|
||||||
BuildRequires: zlib-devel
|
BuildRequires: zlib-devel
|
||||||
@@ -63,6 +77,15 @@
|
|||||||
|
|
||||||
# The bundler/spec/runtime/setup_spec.rb requires the command `man`.
|
# The bundler/spec/runtime/setup_spec.rb requires the command `man`.
|
||||||
%{?with_bundler_tests:BuildRequires: %{_bindir}/man}
|
%{?with_bundler_tests:BuildRequires: %{_bindir}/man}
|
||||||
|
@@ -328,7 +341,7 @@ BuildRequires: procps
|
||||||
|
|
||||||
|
# This package provides %%{_bindir}/ruby-mri therefore it is marked by this
|
||||||
|
# virtual provide. It can be installed as dependency of rubypick.
|
||||||
|
-Provides: ruby(runtime_executable) = %{ruby_release}
|
||||||
|
+Provides: %{name}-ruby(runtime_executable) = %{ruby_release}
|
||||||
|
|
||||||
|
%description
|
||||||
|
Ruby is the interpreted scripting language for quick and easy
|
||||||
@@ -342,7 +355,7 @@ Summary: A Ruby development environme
|
@@ -342,7 +355,7 @@ Summary: A Ruby development environme
|
||||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||||
# This would not be needed if ~50 packages depending on -devel used
|
# This would not be needed if ~50 packages depending on -devel used
|
||||||
@@ -134,7 +157,7 @@
|
|||||||
+Recommends: %{name}-rubygem(io-console)
|
+Recommends: %{name}-rubygem(io-console)
|
||||||
+Requires: %{name}-rubygem(psych) >= %{psych_version}
|
+Requires: %{name}-rubygem(psych) >= %{psych_version}
|
||||||
+Provides: %{name}-gem = %{version}-%{release}
|
+Provides: %{name}-gem = %{version}-%{release}
|
||||||
+Provides: %{name}(rubygems) = %{version}-%{release}
|
+Provides: %{name}-ruby(rubygems) = %{version}-%{release}
|
||||||
+Provides: %{name}-bundled(rubygems) = %{rubygems_version}
|
+Provides: %{name}-bundled(rubygems) = %{rubygems_version}
|
||||||
# https://github.com/rubygems/rubygems/pull/1189#issuecomment-121600910
|
# https://github.com/rubygems/rubygems/pull/1189#issuecomment-121600910
|
||||||
-Provides: bundled(rubygem-molinillo) = %{rubygems_molinillo_version}
|
-Provides: bundled(rubygem-molinillo) = %{rubygems_molinillo_version}
|
||||||
@@ -807,3 +830,13 @@
|
|||||||
%dir %{gem_instdir typeprof}
|
%dir %{gem_instdir typeprof}
|
||||||
%{_bindir}/typeprof
|
%{_bindir}/typeprof
|
||||||
%exclude %{gem_instdir typeprof}/.*
|
%exclude %{gem_instdir typeprof}/.*
|
||||||
|
@@ -1736,6 +1769,9 @@ make -C %{_vpath_builddir} runruby TESTR
|
||||||
|
|
||||||
|
|
||||||
|
%changelog
|
||||||
|
+* Tue Oct 22 2024 Alexey Berezhok <a@brepo.ru> - 3.3.5-3.brepo.1
|
||||||
|
+- Make build for alternative path
|
||||||
|
+
|
||||||
|
* Wed Sep 04 2024 Jarek Prokop <jprokop@redhat.com> - 3.3.5-3
|
||||||
|
- Upgrade to Ruby 3.3.5
|
||||||
|
Resolves: RHEL-55411
|
||||||
|
|||||||
@@ -300,8 +300,8 @@ Patch14: rubygems-3.5.17-Remove-the-lock-file-for-binstubs.patch
|
|||||||
|
|
||||||
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
||||||
%{?with_rubypick:Suggests: rubypick}
|
%{?with_rubypick:Suggests: rubypick}
|
||||||
Recommends: ruby(rubygems) >= %{rubygems_version}
|
Recommends: %{name}-ruby(rubygems) >= %{rubygems_version}
|
||||||
Recommends: rubygem(bigdecimal) >= %{bigdecimal_version}
|
Recommends: %{name}-rubygem(bigdecimal) >= %{bigdecimal_version}
|
||||||
|
|
||||||
BuildRequires: rpm-local-generator-support
|
BuildRequires: rpm-local-generator-support
|
||||||
# Build dependencies
|
# Build dependencies
|
||||||
@@ -341,7 +341,7 @@ BuildRequires: procps
|
|||||||
|
|
||||||
# This package provides %%{_bindir}/ruby-mri therefore it is marked by this
|
# This package provides %%{_bindir}/ruby-mri therefore it is marked by this
|
||||||
# virtual provide. It can be installed as dependency of rubypick.
|
# virtual provide. It can be installed as dependency of rubypick.
|
||||||
Provides: ruby(runtime_executable) = %{ruby_release}
|
Provides: %{name}-ruby(runtime_executable) = %{ruby_release}
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Ruby is the interpreted scripting language for quick and easy
|
Ruby is the interpreted scripting language for quick and easy
|
||||||
@@ -411,7 +411,7 @@ Recommends: %{name}-rubygem(rdoc) >= %{rdoc_version}
|
|||||||
Recommends: %{name}-rubygem(io-console)
|
Recommends: %{name}-rubygem(io-console)
|
||||||
Requires: %{name}-rubygem(psych) >= %{psych_version}
|
Requires: %{name}-rubygem(psych) >= %{psych_version}
|
||||||
Provides: %{name}-gem = %{version}-%{release}
|
Provides: %{name}-gem = %{version}-%{release}
|
||||||
Provides: %{name}(rubygems) = %{version}-%{release}
|
Provides: %{name}-ruby(rubygems) = %{version}-%{release}
|
||||||
Provides: %{name}-bundled(rubygems) = %{rubygems_version}
|
Provides: %{name}-bundled(rubygems) = %{rubygems_version}
|
||||||
# https://github.com/rubygems/rubygems/pull/1189#issuecomment-121600910
|
# https://github.com/rubygems/rubygems/pull/1189#issuecomment-121600910
|
||||||
Provides: %{name}-bundled(rubygem-molinillo) = %{rubygems_molinillo_version}
|
Provides: %{name}-bundled(rubygem-molinillo) = %{rubygems_molinillo_version}
|
||||||
|
|||||||
Reference in New Issue
Block a user