• R/O
  • SSH

contrib-spec-files: Commit

日本OpenSolaris Users Group有志による、レポジトリサーバ作成のためのspecファイル群です。


Commit MetaInfo

Revisionabbf924978bcdac087b245189b306835d91809f4 (tree)
Zeit2019-02-12 14:50:01
AutorFumihisa TONAKA <fumi.ftnk@gmai...>
CommiterFumihisa TONAKA

Log Message

SFEruby-json: fix build for Ruby 2.6 and obsolete Ruby 2.1 and 2.2

Ändern Zusammenfassung

Diff

diff -r aa5a91680604 -r abbf924978bc specs/SFEruby-json.spec
--- a/specs/SFEruby-json.spec Fri Mar 02 15:16:48 2018 +0900
+++ b/specs/SFEruby-json.spec Tue Feb 12 14:50:01 2019 +0900
@@ -1,8 +1,6 @@
11 %include Solaris.inc
22 %include default-depend.inc
33
4-%define build21 %( if [ -x /usr/ruby/2.1/bin/ruby ]; then echo '1'; else echo '0'; fi)
5-%define build22 %( if [ -x /usr/ruby/2.2/bin/ruby ]; then echo '1'; else echo '0'; fi)
64 %define build23 %( if [ -x /usr/ruby/2.3/bin/ruby ]; then echo '1'; else echo '0'; fi)
75 %define build23jposug %( if [ -x /opt/jposug/ruby/2.3/bin/ruby ]; then echo '1'; else echo '0'; fi)
86 %define build24jposug %( if [ -x /opt/jposug/ruby/2.4/bin/ruby ]; then echo '1'; else echo '0'; fi)
@@ -14,6 +12,8 @@
1412 %define gemname json
1513 %define sfe_gemname json
1614
15+# This is a JSON implementation as a Ruby extension in C.
16+
1717 Summary: This is a JSON implementation as a Ruby extension in C.
1818 Name: SFEruby-%{sfe_gemname}
1919 IPS_package_name: library/ruby/%{gemname}
@@ -26,54 +26,6 @@
2626 %description
2727 This is a JSON implementation as a Ruby extension in C.
2828
29-%if %{build21}
30-%if %{keep_dependency}
31-%package 21-old
32-IPS_package_name: library/ruby-21/%{gemname}
33-Summary: This is a JSON implementation as a Ruby extension in C.
34-BuildRequires: runtime/ruby-21 = *
35-Requires: runtime/ruby-21 = *
36-# Requires: library/ruby/%{gemname}-21
37-
38-%description 21-old
39-This is a JSON implementation as a Ruby extension in C.
40-%endif
41-
42-%package 21
43-IPS_package_name: library/ruby/%{gemname}-21
44-Summary: This is a JSON implementation as a Ruby extension in C.
45-BuildRequires: runtime/ruby-21 = *
46-Requires: runtime/ruby-21 = *
47-# Requires: library/ruby/%{gemname}
48-
49-%description 21
50-This is a JSON implementation as a Ruby extension in C.
51-%endif
52-
53-%if %{build22}
54-%if %{keep_dependency}
55-%package 22-old
56-IPS_package_name: library/ruby-22/%{gemname}
57-Summary: This is a JSON implementation as a Ruby extension in C.
58-BuildRequires: runtime/ruby-22 = *
59-Requires: runtime/ruby-22 = *
60-# Requires: library/ruby/%{gemname}-22
61-
62-%description 22-old
63-This is a JSON implementation as a Ruby extension in C.
64-%endif
65-
66-%package 22
67-IPS_package_name: library/ruby/%{gemname}-22
68-Summary: This is a JSON implementation as a Ruby extension in C.
69-BuildRequires: runtime/ruby-22 = *
70-Requires: runtime/ruby-22 = *
71-# Requires: library/ruby/%{gemname}
72-
73-%description 22
74-This is a JSON implementation as a Ruby extension in C.
75-%endif
76-
7729 %if %{build23}
7830 %if %{keep_dependency}
7931 %package 23-old
@@ -169,22 +121,13 @@
169121
170122 ${bindir}/gem install --local \
171123 --no-env-shebang \
124+ --no-document \
172125 --install-dir .${gemdir} \
173126 --bindir .${bindir} \
174- --no-ri \
175- --no-rdoc \
176127 -V \
177128 --force %{SOURCE0}
178129 }
179130
180-%if %{build21}
181-# ruby-21
182-build_for 2.1
183-%endif
184-%if %{build22}
185-# ruby-22
186-build_for 2.2
187-%endif
188131 %if %{build23}
189132 # ruby-23
190133 build_for 2.3
@@ -268,12 +211,6 @@
268211
269212 }
270213
271-%if %{build21}
272-install_for 2.1
273-%endif
274-%if %{build22}
275-install_for 2.2
276-%endif
277214 %if %{build23}
278215 install_for 2.3
279216 %endif
@@ -296,28 +233,6 @@
296233 %files
297234 %defattr(0755,root,bin,-)
298235
299-%if %{build21}
300-%files 21
301-%defattr(0755,root,bin,-)
302-%dir %attr (0755, root, sys) /usr
303-/usr/ruby/2.1
304-%if %{generate_executable}
305-%dir %attr (0755, root, bin) /usr/bin
306-%attr (0755, root, bin) /usr/bin/*21
307-%endif
308-%endif
309-
310-%if %{build22}
311-%files 22
312-%defattr(0755,root,bin,-)
313-%dir %attr (0755, root, sys) /usr
314-/usr/ruby/2.2
315-%if %{generate_executable}
316-%dir %attr (0755, root, bin) /usr/bin
317-%attr (0755, root, bin) /usr/bin/*22
318-%endif
319-%endif
320-
321236 %if %{build23}
322237 %files 23
323238 %defattr(0755,root,bin,-)
@@ -375,6 +290,8 @@
375290
376291
377292 %changelog
293+* Tue Feb 12 2019 - Fumihisa TONAKA <fumi.ftnk@gmail.com>
294+- fix build for Ruby 2.6 and obsolete Ruby 2.1 and 2.2
378295 * Fri Mar 02 2018 - Fumihisa TONAKA <fumi.ftnk@gmail.com>
379296 - bump to 2.1.0
380297 * Fri Jan 13 2017 - Fumihisa TONAKA <fumi.ftnk@gmail.com>
Show on old repository browser