rpms/ruby
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make %gemspec_{add,remove}_dep modify .gemspec provided by %setup macro.

Browse Source 
The macros need to be udpated, since RPM 4.14+ can expand .gem files and
also also provide %{gem_name}.gemspec file used to rebuild the gem.
However, the .gemspec file is not in current directory, but directly in
%{_builddir}.
This commit is contained in:
Vít Ondruch 2018-05-02 17:00:36 +02:00
parent b0274e84e7
commit bee5851fb0
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
macros.rubygems
View File

@ -60,7 +60,7 @@ gem install \\\
# #
%gemspec_add_dep(g:s:d) \ %gemspec_add_dep(g:s:d) \
read -d '' gemspec_add_dep_script << 'EOR' || : \ read -d '' gemspec_add_dep_script << 'EOR' || : \
gemspec_file = '%{-s*}%{!?-s:./%{gem_name}.gemspec}' \ gemspec_file = '%{-s*}%{!?-s:%{_builddir}/%{gem_name}-%{version}.gemspec}' \
\ \
name = '%{-g*}' \ name = '%{-g*}' \
requirements = %{*}%{!?1:nil} \ requirements = %{*}%{!?1:nil} \
@ -97,7 +97,7 @@ unset -v gemspec_add_dep_script \
# #
%gemspec_remove_dep(g:s:d) \ %gemspec_remove_dep(g:s:d) \
read -d '' gemspec_remove_dep_script << 'EOR' || : \ read -d '' gemspec_remove_dep_script << 'EOR' || : \
gemspec_file = '%{-s*}%{!?-s:./%{gem_name}.gemspec}' \ gemspec_file = '%{-s*}%{!?-s:%{_builddir}/%{gem_name}-%{version}.gemspec}' \
\ \
name = '%{-g*}' \ name = '%{-g*}' \
requirements = %{*}%{!?1:nil} \ requirements = %{*}%{!?1:nil} \

5
ruby.spec
View File

@ -21,7 +21,7 @@
%endif %endif
%global release 92 %global release 93
%{!?release_string:%global release_string %{?development_release:0.}%{release}%{?development_release:.%{development_release}}%{?dist}} %{!?release_string:%global release_string %{?development_release:0.}%{release}%{?development_release:.%{development_release}}%{?dist}}
# The RubyGems library has to stay out of Ruby directory three, since the # The RubyGems library has to stay out of Ruby directory three, since the
@ -1068,6 +1068,9 @@ make check TESTS="-v $DISABLE_TESTS"
%{gem_dir}/specifications/xmlrpc-%{xmlrpc_version}.gemspec %{gem_dir}/specifications/xmlrpc-%{xmlrpc_version}.gemspec
%changelog %changelog
* Wed May 02 2018 Vít Ondruch <vondruch@redhat.com> - 2.5.1-93
- Make %%gemspec_{add,remove}_dep modify .gemspec provided by %%setup macro.
* Tue Apr 10 2018 Vít Ondruch <vondruch@redhat.com> - 2.5.1-92 * Tue Apr 10 2018 Vít Ondruch <vondruch@redhat.com> - 2.5.1-92
- Conflict requirement needs to generate dependency. - Conflict requirement needs to generate dependency.
- Stop using --with-setjmp-type=setjmp on aarch64 (rhbz#1545239). - Stop using --with-setjmp-type=setjmp on aarch64 (rhbz#1545239).