From 4c64906d48740780db0ecb3df9893fc8dcc56388 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Wed, 25 Jun 2014 17:37:03 -0500 Subject: [PATCH] Fixes for Ruby 2.1 packaging guidelines (#1107150) --- rubygem-json.spec | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/rubygem-json.spec b/rubygem-json.spec index 73b794b..3e723c0 100644 --- a/rubygem-json.spec +++ b/rubygem-json.spec @@ -2,7 +2,7 @@ Name: rubygem-%{gem_name} Version: 1.7.7 -Release: 102%{?dist} +Release: 103%{?dist} Summary: A JSON implementation in Ruby @@ -16,11 +16,8 @@ BuildRequires: ruby(release) BuildRequires: ruby-devel BuildRequires: rubygems-devel BuildRequires: rubygem(rake) -BuildRequires: rubygem(minitest) +BuildRequires: rubygem(minitest4) BuildRequires: rubygem(bigdecimal) -Requires: ruby(release) -Requires: rubygems -Provides: rubygem(json) = %{version} Obsoletes: rubygem-%{gem_name}-gui < %{version} Obsoletes: ruby-%{gem_name}-gui < %{version} @@ -80,13 +77,10 @@ rm -fr .%{gem_instdir}/lib/json/pure* %install mkdir -p $RPM_BUILD_ROOT%{gem_dir} +mkdir -p $RPM_BUILD_ROOT%{gem_extdir_mri} cp -a .%{gem_dir}/* %{buildroot}/%{gem_dir} - -# Let's move arch dependent files to arch specific directory -mkdir -p $RPM_BUILD_ROOT%{gem_extdir_mri}/lib/json/ext -install -cpm 0755 ./%{gem_instdir}/lib/json/ext/*.so \ - $RPM_BUILD_ROOT%{gem_extdir_mri}/lib/json/ext/ +cp -a .%{gem_extdir_mri}/{gem.build_complete,json} %{buildroot}/%{gem_extdir_mri}/ find $RPM_BUILD_ROOT%{gem_instdir} -name \*.rb -print0 | \ xargs --null chmod 0644 @@ -134,6 +128,9 @@ popd %changelog +* Wed Jun 25 2014 Yaakov Selkowitz - 1.7.7-103 +- Fixes for Ruby 2.1 packaging guidelines (#1107150) + * Sun Jun 08 2014 Fedora Release Engineering - 1.7.7-102 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild