rpms/ruby
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Properly support %prerelease in %gemspec_ macros.

Browse Source
This commit is contained in:
Vít Ondruch 2019-06-25 13:48:27 +02:00
parent 1cc2a497d3
commit 13a1b3e907
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
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:%{_builddir}/%{gem_name}-%{version}.gemspec}' \ gemspec_file = '%{-s*}%{!?-s:%{_builddir}/%{gem_name}-%{version}%{?prerelease}.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:%{_builddir}/%{gem_name}-%{version}.gemspec}' \ gemspec_file = '%{-s*}%{!?-s:%{_builddir}/%{gem_name}-%{version}%{?prerelease}.gemspec}' \
\ \
name = '%{-g*}' \ name = '%{-g*}' \
requirements = %{*}%{!?1:nil} \ requirements = %{*}%{!?1:nil} \
@ -144,7 +144,7 @@ unset -v gemspec_remove_dep_script \
# #
%gemspec_add_file(s:tr) \ %gemspec_add_file(s:tr) \
read -d '' gemspec_add_file_script << 'EOR' || : \ read -d '' gemspec_add_file_script << 'EOR' || : \
gemspec_file = '%{-s*}%{!?-s:%{_builddir}/%{gem_name}-%{version}.gemspec}' \ gemspec_file = '%{-s*}%{!?-s:%{_builddir}/%{gem_name}-%{version}%{?prerelease}.gemspec}' \
\ \
abort("gemspec_add_file: Use only one '-t' or '-r' at a time.") if "%{?-t}%{?-r}" == "-t-r" \ abort("gemspec_add_file: Use only one '-t' or '-r' at a time.") if "%{?-t}%{?-r}" == "-t-r" \
\ \
@ -177,7 +177,7 @@ unset -v gemspec_add_file_script \
# #
%gemspec_remove_file(s:tr) \ %gemspec_remove_file(s:tr) \
read -d '' gemspec_remove_file_script << 'EOR' || : \ read -d '' gemspec_remove_file_script << 'EOR' || : \
gemspec_file = '%{-s*}%{!?-s:%{_builddir}/%{gem_name}-%{version}.gemspec}' \ gemspec_file = '%{-s*}%{!?-s:%{_builddir}/%{gem_name}-%{version}%{?prerelease}.gemspec}' \
\ \
abort("gemspec_remove_file: Use only one '-t' or '-r' at a time.") if "%{?-t}%{?-r}" == "-t-r" \ abort("gemspec_remove_file: Use only one '-t' or '-r' at a time.") if "%{?-t}%{?-r}" == "-t-r" \
\ \

5
ruby.spec
View File

@ -21,7 +21,7 @@
%endif %endif
%global release 120 %global release 121
%{!?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 tree, since the # The RubyGems library has to stay out of Ruby directory tree, since the
@ -1182,6 +1182,9 @@ make check TESTS="-v $DISABLE_TESTS" MSPECOPT="-fs $MSPECOPTS"
%{_mandir}/man5/gemfile.5* %{_mandir}/man5/gemfile.5*
%changelog %changelog
* Tue Jun 25 2019 Vít Ondruch <vondruch@redhat.com> - 2.6.3-121
- Properly support %%prerelease in %%gemspec_ macros.
* Thu Apr 25 2019 Pavel Valena <pvalena@redhat.com> - 2.6.3-120 * Thu Apr 25 2019 Pavel Valena <pvalena@redhat.com> - 2.6.3-120
- Update to Ruby 2.6.3. - Update to Ruby 2.6.3.