Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Utilize the newest macros in rubygem-json

  • Loading branch information...
commit 66a1b33f00e13eaf6c10f6fa8a1779d345e15d69 1 parent bf74b2f
Slavek Kabrda authored December 19, 2012

Showing 1 changed file with 16 additions and 13 deletions. Show diff stats Hide diff stats

  1. 29  rubygem-json/rubygem-json.spec
29  rubygem-json/rubygem-json.spec
@@ -4,7 +4,7 @@
4 4
 
5 5
 Name:           rubygem-%{gem_name}
6 6
 Version:        1.6.5
7  
-Release:        4%{?dist}
  7
+Release:        5%{?dist}
8 8
 
9 9
 Summary:        A JSON implementation in Ruby
10 10
 
@@ -55,14 +55,14 @@ Requires:	%{name} = %{version}-%{release}
55 55
 This package contains documentation for %{name}.
56 56
 
57 57
 %if 0%{?with_jruby_ext}
58  
-%package	java
  58
+%package	jruby
59 59
 Summary:	JRuby extension for %{name}
60 60
 Group:		Development/Languages
61 61
 
62 62
 Requires:	%{name} = %{version}-%{release}
63 63
 Requires:       jruby
64 64
 
65  
-%description	java
  65
+%description	jruby
66 66
 This package contains JRuby extension for %{name}.
67 67
 %endif
68 68
 
@@ -112,12 +112,12 @@ cp -a .%{gem_dir}/* %{buildroot}/%{gem_dir}
112 112
 
113 113
 %if 0%{?with_jruby_ext}
114 114
 # the noarch part is common, so just link to it
115  
-rm -fr %{buildroot}%{gem_instdir_java}
116  
-ln -s %{gem_instdir} %{buildroot}%{gem_instdir_java}
  115
+rm -fr %{buildroot}%{gem_instdir_jruby}
  116
+ln -s %{gem_instdir} %{buildroot}%{gem_instdir_jruby}
117 117
 # create java extdir and make the gemspec aware of extensions, so that they get loaded
118  
-mkdir -p $RPM_BUILD_ROOT%{gem_extdir_java}/ext/%{gem_name}/ext/%{gem_name}/ext
119  
-cp -a .%{gem_instdir}/lib/json/ext/*.jar $RPM_BUILD_ROOT%{gem_extdir_java}/ext/%{gem_name}/ext/%{gem_name}/ext
120  
-sed -i 's|"lib"]|"ext/json/ext", "ext", "lib"]\ns.extensions = ["doesnt_matter_whats_here"]|' %{buildroot}%{gem_spec_java}
  118
+mkdir -p $RPM_BUILD_ROOT%{gem_extdir_jruby}/ext/%{gem_name}/ext/%{gem_name}/ext
  119
+cp -a .%{gem_instdir}/lib/json/ext/*.jar $RPM_BUILD_ROOT%{gem_extdir_jruby}/ext/%{gem_name}/ext/%{gem_name}/ext
  120
+sed -i 's|"lib"]|"ext/json/ext", "ext", "lib"]\ns.extensions = ["doesnt_matter_whats_here"]|' %{buildroot}%{gem_spec_jruby}
121 121
 %endif
122 122
 
123 123
 # Let's move arch dependent files to arch specific directory
@@ -175,15 +175,18 @@ popd
175 175
 %{gem_docdir}/
176 176
 
177 177
 %if 0%{?with_jruby_ext}
178  
-%files      java
  178
+%files      jruby
179 179
 %defattr(-,root,root,-)
180  
-%exclude %{gem_cache_java}
181  
-%{gem_instdir_java}
182  
-%{gem_spec_java}
183  
-%{gem_extdir_java}
  180
+%exclude %{gem_cache_jruby}
  181
+%{gem_instdir_jruby}
  182
+%{gem_spec_jruby}
  183
+%{gem_extdir_jruby}
184 184
 %endif
185 185
 
186 186
 %changelog
  187
+* Tue Dec 04 2012 Bohuslav Kabrda <bkabrda@redhat.com> - 1.6.5-5
  188
+- Utilize even newer JRuby macros :)
  189
+
187 190
 * Fri Nov 02 2012 Bohuslav Kabrda <bkabrda@redhat.com> - 1.6.5-4
188 191
 - Use the -java gem to get separate gemspec for JRuby ext.
189 192
 - Utilize new RubyGems JRuby macros.

0 notes on commit 66a1b33

Please sign in to comment.
Something went wrong with that request. Please try again.