[ruby/private-ruby-2.1] Don't link cert.pem explicitely
Josef Stribny
jstribny at fedoraproject.org
Mon Feb 10 13:17:20 UTC 2014
commit b038223eae017fc71e3b2e1cc1221a7308bfdeba
Author: Josef Stribny <jstribny at redhat.com>
Date: Mon Feb 10 14:17:53 2014 +0100
Don't link cert.pem explicitely
ruby.spec | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
---
diff --git a/ruby.spec b/ruby.spec
index 6a4e404..86359f7 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -28,7 +28,7 @@
%endif
-%global release 18
+%global release 19
%{!?release_string:%global release_string %{?development_release:0.}%{release}%{?development_release:.%{development_release}}%{?dist}}
%global rubygems_version 2.2.0
@@ -172,8 +172,6 @@ BuildRequires: tk-devel
# Needed to pass test_set_program_name(TestRubyOptions)
BuildRequires: procps
BuildRequires: %{_bindir}/dtrace
-# Unbundle cert.pem
-BuildRequires: ca-certificates
# RubyGems test suite optional dependencies.
BuildRequires: %{_bindir}/git
BuildRequires: %{_bindir}/cmake
@@ -219,7 +217,6 @@ Requires: ruby(release)
Requires: rubygem(rdoc) >= %{rdoc_version}
Requires: rubygem(io-console) >= %{io_console_version}
Requires: rubygem(psych) >= %{psych_version}
-Requires: ca-certificates
Provides: gem = %{version}-%{release}
Provides: ruby(rubygems) = %{version}-%{release}
BuildArch: noarch
@@ -480,11 +477,6 @@ sed -i "s/%%{name}/%{name}/" %{buildroot}%{_rpmconfigdir}/macros.d/macros.ruby
install -m 644 %{SOURCE5} %{buildroot}%{_rpmconfigdir}/macros.d/macros.rubygems
sed -i "s/%%{name}/%{name}/" %{buildroot}%{_rpmconfigdir}/macros.d/macros.rubygems
-# Kill bundled cert.pem
-mkdir -p %{buildroot}%{rubygems_dir}/rubygems/ssl_certs/
-ln -sf %{_sysconfdir}/pki/tls/cert.pem \
- %{buildroot}%{rubygems_dir}/rubygems/ssl_certs/ca-bundle.pem
-
# Install custom operating_system.rb.
mkdir -p %{buildroot}%{rubygems_dir}/rubygems/defaults
cp %{SOURCE1} %{buildroot}%{rubygems_dir}/rubygems/defaults
@@ -898,6 +890,9 @@ OPENSSL_ENABLE_MD5_VERIFY=1 make check TESTS="-v $DISABLE_TESTS"
%{ruby_libdir}/tkextlib
%changelog
+* Mon Feb 10 2014 Josef Stribny <jstribny at redhat.com> - 2.1.0-19
+- Don't link cert.pem explicitely
+
* Wed Jan 15 2014 Vít Ondruch <vondruch at redhat.com> - 2.1.0-18
- Don't generate documentation on unexpected places.
- Detect if rubygems are running under rpmbuild and install gem binary
More information about the scm-commits
mailing list