From 25bcd807bf74e26f97e019c11c5da1aa290bc999 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Apr 20 2012 17:28:10 +0000 Subject: 1.8.23 - Use system-wide cert.pem --- diff --git a/.gitignore b/.gitignore index ad69a24..dd4fba4 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ rubygems-1.3.7.tgz /rubygems-1.8.11.tgz /rubygems-1.8.15.tgz /rubygems-1.8.22.tgz +/rubygems-1.8.23.tgz diff --git a/rubygems.spec b/rubygems.spec index f661fe7..c1a7c69 100644 --- a/rubygems.spec +++ b/rubygems.spec @@ -17,8 +17,8 @@ Summary: The Ruby standard for packaging ruby libraries Name: rubygems -Version: 1.8.22 -Release: 1%{?dist} +Version: 1.8.23 +Release: 20%{?dist} Group: Development/Libraries License: Ruby or MIT @@ -56,6 +56,7 @@ Patch109: rubygems-1.8.11-binary-extensions.patch Requires: ruby(abi) = 1.9.1 Requires: rubygem(rdoc) >= 3.9.4 Requires: rubygem(io-console) >= 0.3 +Requires: ca-certificates BuildRequires: ruby(abi) = 1.9.1 %if %{enable_check} # For mkmf.rb @@ -65,6 +66,8 @@ BuildRequires: rubygem(rake) BuildRequires: rubygem(rdoc) >= 3.9.4 BuildRequires: rubygem(io-console) >= 0.3 %endif +# Unbundle cert.pem +BuildRequires: ca-certificates BuildArch: noarch Provides: ruby(rubygems) = %{version}-%{release} Provides: gem = %{version}-%{release} @@ -120,6 +123,11 @@ rmdir %{buildroot}%{rubygems_dir}/lib mkdir -p %{buildroot}%{rubygems_dir}/rubygems/defaults install -cpm 0644 %{SOURCE100} %{buildroot}%{rubygems_dir}/rubygems/defaults/ +# 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 + # Create gem folders. mkdir -p %{buildroot}%{gem_dir}/{cache,gems,specifications,doc} mkdir -p %{buildroot}%{gem_extdir}/exts @@ -185,6 +193,10 @@ testrb test %config(noreplace) %{_sysconfdir}/rpm/macros.rubygems %changelog +* Sat Apr 21 2012 Mamoru Tasaka - 1.8.23-20 +- 1.8.23 +- Use system-wide cert.pem + * Thu Apr 18 2012 Mamoru Tasaka - 1.8.22-1 - 1.8.22 diff --git a/sources b/sources index 8e13f48..9e3ddd3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fd06f165d08f99918de5095be2a9435c rubygems-1.8.22.tgz +178b0ebae78dbb46963c51ad29bb6bd9 rubygems-1.8.23.tgz