diff --git a/.gitignore b/.gitignore index 42e181b..5f7265d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /deep_merge-1.0.1.gem +/deep_merge-1.1.1.gem diff --git a/rubygem-deep_merge.spec b/rubygem-deep_merge.spec index 6b6c6dc..0cda84e 100644 --- a/rubygem-deep_merge.spec +++ b/rubygem-deep_merge.spec @@ -5,39 +5,22 @@ %global gem_name deep_merge Name: rubygem-%{gem_name} -Version: 1.0.1 -Release: 8%{?dist} +Version: 1.1.1 +Release: 1%{?dist} Summary: Merge Deeply Nested Hashes Group: Development/Languages License: MIT URL: https://github.com/danielsdeleo/deep_merge Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem -# https://github.com/danielsdeleo/deep_merge/pull/13 -Patch0: deep_merge-minitest5.patch -# LICENSE file is in git repository but not in package. -# https://github.com/danielsdeleo/deep_merge/pull/14 -Source1: https://raw.githubusercontent.com/danielsdeleo/deep_merge/master/LICENSE -%if 0%{?el6} -Requires: ruby(abi) = 1.8 -%endif -%if 0%{?fc19} || 0%{?fc20} || 0%{?el7} -Requires: ruby(release) -%endif Requires: ruby(rubygems) BuildRequires: rubygems-devel BuildRequires: ruby %if 0%{?enable_checks} -%if 0%{?fc19} || 0%{?fc20} || 0%{?el6} || 0%{?el7} -BuildRequires: rubygem(minitest) < 5 -%else BuildRequires: rubygem(minitest) >= 5 -%endif +BuildRequires: rubygem(test-unit) %endif BuildArch: noarch -%if 0%{?fc19} || 0%{?fc20} || 0%{?el6} || 0%{?el7} -Provides: rubygem(%{gem_name}) = %{version} -%endif %description Recursively merge hashes. @@ -58,13 +41,6 @@ gem unpack %{SOURCE0} gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec -%if 0%{?fc19} || 0%{?fc20} || 0%{?el6} || 0%{?el7} -%else -%patch0 -p1 -%endif -cp -p %{SOURCE1} LICENSE - - %build # Create the gem as gem install only works on a gem file gem build %{gem_name}.gemspec @@ -85,14 +61,14 @@ ruby -Ilib test/test_deep_merge.rb %files %dir %{gem_instdir} + %{gem_libdir} %exclude %{gem_cache} %exclude %{gem_instdir}/CHANGELOG %exclude %{gem_instdir}/test %exclude %{gem_instdir}/Rakefile %{gem_spec} -%doc LICENSE -%doc +%doc %{gem_instdir}/LICENSE %files doc %doc %{gem_docdir} @@ -100,6 +76,9 @@ ruby -Ilib test/test_deep_merge.rb %changelog +* Thu Mar 23 2017 Steve Traylen - 1.1.1-1 +- Update to 1.1.1 + * Sat Feb 11 2017 Fedora Release Engineering - 1.0.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 1d87d88..13dba86 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6f30bc4727f1833410f6a508304ab3c1 deep_merge-1.0.1.gem +SHA512 (deep_merge-1.1.1.gem) = 3e2ccf9a8e715469937f8d61cd73289fcf14a455d337db903d05e5ef88c2793c55a7dfde73e6d0054ec06ef670c83079f290e915f8c295f0de4575cc7caaddac