rpms/ruby
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Don't link cert.pem explicitely

Browse Source
This commit is contained in:
Josef Stribny 2014-02-10 14:13:33 +01:00
parent c4c64c841c
commit bbb52ff9a6
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ruby.spec
View File

@ -26,7 +26,7 @@
%endif %endif
%global release 17 %global release 18
%{!?release_string:%global release_string %{?development_release:0.}%{release}%{?development_release:.%{development_release}}%{?dist}} %{!?release_string:%global release_string %{?development_release:0.}%{release}%{?development_release:.%{development_release}}%{?dist}}
%global rubygems_version 2.0.14 %global rubygems_version 2.0.14
@ -179,8 +179,6 @@ BuildRequires: tk-devel
# Needed to pass test_set_program_name(TestRubyOptions) # Needed to pass test_set_program_name(TestRubyOptions)
BuildRequires: procps BuildRequires: procps
BuildRequires: %{_bindir}/dtrace BuildRequires: %{_bindir}/dtrace
# Unbundle cert.pem
BuildRequires: ca-certificates
# 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.
@ -223,7 +221,6 @@ Requires: ruby(release)
Requires: rubygem(rdoc) >= %{rdoc_version} Requires: rubygem(rdoc) >= %{rdoc_version}
Requires: rubygem(io-console) >= %{io_console_version} Requires: rubygem(io-console) >= %{io_console_version}
Requires: rubygem(psych) >= %{psych_version} Requires: rubygem(psych) >= %{psych_version}
Requires: ca-certificates
Provides: gem = %{version}-%{release} Provides: gem = %{version}-%{release}
Provides: ruby(rubygems) = %{version}-%{release} Provides: ruby(rubygems) = %{version}-%{release}
BuildArch: noarch BuildArch: noarch
@ -488,11 +485,6 @@ sed -i "s/%%{name}/%{name}/" %{buildroot}%{_sysconfdir}/rpm/macros.ruby
install -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/rpm/macros.rubygems install -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/rpm/macros.rubygems
sed -i "s/%%{name}/%{name}/" %{buildroot}%{_sysconfdir}/rpm/macros.rubygems sed -i "s/%%{name}/%{name}/" %{buildroot}%{_sysconfdir}/rpm/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. # Install custom operating_system.rb.
mkdir -p %{buildroot}%{rubygems_dir}/rubygems/defaults mkdir -p %{buildroot}%{rubygems_dir}/rubygems/defaults
cp %{SOURCE1} %{buildroot}%{rubygems_dir}/rubygems/defaults cp %{SOURCE1} %{buildroot}%{rubygems_dir}/rubygems/defaults
@ -893,6 +885,9 @@ OPENSSL_ENABLE_MD5_VERIFY=1 make check TESTS="-v $DISABLE_TESTS"
%{ruby_libdir}/tkextlib %{ruby_libdir}/tkextlib
%changelog %changelog
* Mon Feb 10 2014 Josef Stribny <jstribny@redhat.com> - 2.0.0.353-18
- Don't link cert.pem explicitely
* Wed Jan 15 2014 Vít Ondruch <vondruch@redhat.com> - 2.0.0.353-17 * Wed Jan 15 2014 Vít Ondruch <vondruch@redhat.com> - 2.0.0.353-17
- Fix RubyGems version (rhbz#1036708). - Fix RubyGems version (rhbz#1036708).
- Fix FTBFS due to expired certificate for IMAP test case. - Fix FTBFS due to expired certificate for IMAP test case.