Always use full tar.gz for installed files and

keep using gem file for gem spec (ref: bug 1425220)
This commit is contained in:
Mamoru TASAKA 2017-02-21 16:38:10 +09:00
parent 9b467561e2
commit d54e4ceab8

View File

@ -3,7 +3,7 @@
%global mainver 3.5.0 %global mainver 3.5.0
%undefine prever %undefine prever
%global mainrel 2 %global mainrel 3
%global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g')
%global need_bootstrap_set 0 %global need_bootstrap_set 0
@ -56,15 +56,12 @@ Documentation for %{name}
%global version %{version_orig}%{?prever} %global version %{version_orig}%{?prever}
%prep %prep
gem unpack %{SOURCE0} %setup -q -T -n %{gem_name}-%{version} -b 1
%setup -q -D -T -n %{gem_name}-%{version} -a 1
gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
(
cd %{gem_name}-%{version}
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
) %patch2 -p1
%build %build
gem build %{gem_name}.gemspec gem build %{gem_name}.gemspec
@ -78,9 +75,6 @@ cp -pa .%{gem_dir}/* \
%if 0%{?need_bootstrap_set} < 1 %if 0%{?need_bootstrap_set} < 1
%check %check
LANG=en_US.UTF-8 LANG=en_US.UTF-8
pushd %{gem_name}-%{version}
cat %{PATCH2} | patch -p1
# Test failure needs investigation... # Test failure needs investigation...
FAILFILE=() FAILFILE=()
@ -98,8 +92,6 @@ for ((i = 0; i < ${#FAILFILE[@]}; i++)) {
ruby -rubygems -Ilib/ -S rspec spec/ || \ ruby -rubygems -Ilib/ -S rspec spec/ || \
ruby -rubygems -Ilib/ -S rspec --tag ~broken ruby -rubygems -Ilib/ -S rspec --tag ~broken
popd
%endif %endif
%files %files
@ -116,6 +108,10 @@ popd
%doc %{gem_docdir} %doc %{gem_docdir}
%changelog %changelog
* Tue Feb 21 2017 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.5.0-3
- Always use full tar.gz for installed files and
keep using gem file for gem spec (ref: bug 1425220)
* Fri Feb 03 2017 Jun Aruga <jaruga@redhat.com> - 3.5.0-2 * Fri Feb 03 2017 Jun Aruga <jaruga@redhat.com> - 3.5.0-2
- Fix for Ruby 2.4.0 compatibility. - Fix for Ruby 2.4.0 compatibility.