diff --git a/.gitignore b/.gitignore index f9c2241..ebac1de 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /hocon-0.9.3.gem /rubygem-hocon-7defef5.tar.gz +/hocon-1.2.4.gem diff --git a/rubygem-hocon.spec b/rubygem-hocon.spec index 6dac85b..d288d3c 100644 --- a/rubygem-hocon.spec +++ b/rubygem-hocon.spec @@ -8,23 +8,14 @@ %endif Name: rubygem-%{gem_name} -Version: 0.9.3 -Release: 5%{?dist} +Version: 1.2.4 +Release: 1%{?dist} Summary: HOCON Config Library Group: Development/Languages License: ASL 2.0 URL: https://github.com/puppetlabs/ruby-hocon Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem -# https://github.com/puppetlabs/ruby-hocon/issues/65 -# SOURCE1 contains the upstream project from github -# in particular this includes the spec directory which was not -# included in the gemfile. -# The following hash corresponds to 0.9.3 tag. -%global commit0 7defef5927bc79dd6d25e3dd2ac42b9e9876c67f -%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) -Source1: https://github.com/puppetlabs/ruby-hocon/archive/%{commit0}.tar.gz#/%{name}-%{shortcommit0}.tar.gz - BuildRequires: ruby(release) BuildRequires: rubygems-devel BuildRequires: ruby >= 1.9.0 @@ -32,9 +23,6 @@ BuildRequires: ruby >= 1.9.0 BuildRequires: rubygem(rspec) %endif BuildArch: noarch -%if 0%{?el7} -Provides: rubygem(hocon) = %{version}-%{release} -%endif %description A port of the Java Typesafe Config @@ -56,9 +44,7 @@ gem unpack %{SOURCE0} %setup -q -D -T -n %{gem_name}-%{version} gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec - -# unpack only the spec files from SOURCE2. -tar zxf %{SOURCE1} ruby-hocon-7defef5927bc79dd6d25e3dd2ac42b9e9876c67f/spec --strip-components 1 +sed -i 's/\/usr\/bin\/env ruby/\/usr\/bin\/ruby/' bin/hocon %build # Create the gem as gem install only works on a gem file @@ -72,6 +58,9 @@ gem build %{gem_name}.gemspec mkdir -p %{buildroot}%{gem_dir} cp -a .%{gem_dir}/* \ %{buildroot}%{gem_dir}/ +mkdir -p %{buildroot}%{_bindir} +mv %{buildroot}%{gem_instdir}/bin/hocon %{buildroot}/%{_bindir}/hocon + %check %if 0%{?enable_checks} @@ -83,14 +72,20 @@ rspec spec/ %license %{gem_instdir}/LICENSE %{gem_libdir} %exclude %{gem_cache} +%exclude %{gem_instdir}/spec %{gem_spec} +%{_bindir}/hocon %files doc %doc %{gem_docdir} %doc %{gem_instdir}/CHANGELOG.md +%doc %{gem_instdir}/HISTORY.md %doc %{gem_instdir}/README.md %changelog +* Thu Mar 23 2017 Steve Traylen - 1.2.4-1 +- Update to 1.2.4 + * Sat Feb 11 2017 Fedora Release Engineering - 0.9.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 71c4c6b..d160f60 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -af89595899c3b893787045039ff02ee0 hocon-0.9.3.gem -1a2d311aef21fef8415cfee7b83fa4df rubygem-hocon-7defef5.tar.gz +SHA512 (hocon-1.2.4.gem) = 7d0b00d564114b9c21df1bca5aef4bbd9f1957239e28493ac7b92830ad5da5216e6a16b54f8da6857c12c751deb42c0e33a5c8f2e9c3f6b1efdc7a4bac810cf1