Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
  • 5 commits
  • 2 files changed
  • 0 comments
  • 2 contributors
30  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
 
@@ -30,6 +30,7 @@ BuildRequires:  rubygems-devel
30 30
 BuildRequires:  rubygem(rake)
31 31
 BuildRequires:	rubygem(minitest)
32 32
 BuildRequires:	rubygem(bigdecimal)
  33
+Requires:       ruby
33 34
 Requires:       ruby(abi) = %{rubyabi}
34 35
 Requires:       rubygems
35 36
 Provides:       rubygem(json) = %{version}
@@ -55,14 +56,14 @@ Requires:	%{name} = %{version}-%{release}
55 56
 This package contains documentation for %{name}.
56 57
 
57 58
 %if 0%{?with_jruby_ext}
58  
-%package	java
  59
+%package	jruby
59 60
 Summary:	JRuby extension for %{name}
60 61
 Group:		Development/Languages
61 62
 
62 63
 Requires:	%{name} = %{version}-%{release}
63 64
 Requires:       jruby
64 65
 
65  
-%description	java
  66
+%description	jruby
66 67
 This package contains JRuby extension for %{name}.
67 68
 %endif
68 69
 
@@ -112,12 +113,12 @@ cp -a .%{gem_dir}/* %{buildroot}/%{gem_dir}
112 113
 
113 114
 %if 0%{?with_jruby_ext}
114 115
 # 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}
  116
+rm -fr %{buildroot}%{gem_instdir_jruby}
  117
+ln -s %{gem_instdir} %{buildroot}%{gem_instdir_jruby}
117 118
 # 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}
  119
+mkdir -p $RPM_BUILD_ROOT%{gem_extdir_jruby}/ext/%{gem_name}/ext/%{gem_name}/ext
  120
+cp -a .%{gem_instdir}/lib/json/ext/*.jar $RPM_BUILD_ROOT%{gem_extdir_jruby}/ext/%{gem_name}/ext/%{gem_name}/ext
  121
+sed -i 's|"lib"]|"ext/json/ext", "ext", "lib"]\ns.extensions = ["doesnt_matter_whats_here"]|' %{buildroot}%{gem_spec_jruby}
121 122
 %endif
122 123
 
123 124
 # Let's move arch dependent files to arch specific directory
@@ -175,15 +176,18 @@ popd
175 176
 %{gem_docdir}/
176 177
 
177 178
 %if 0%{?with_jruby_ext}
178  
-%files      java
  179
+%files      jruby
179 180
 %defattr(-,root,root,-)
180  
-%exclude %{gem_cache_java}
181  
-%{gem_instdir_java}
182  
-%{gem_spec_java}
183  
-%{gem_extdir_java}
  181
+%exclude %{gem_cache_jruby}
  182
+%{gem_instdir_jruby}
  183
+%{gem_spec_jruby}
  184
+%{gem_extdir_jruby}
184 185
 %endif
185 186
 
186 187
 %changelog
  188
+* Tue Dec 04 2012 Bohuslav Kabrda <bkabrda@redhat.com> - 1.6.5-5
  189
+- Utilize even newer JRuby macros :)
  190
+
187 191
 * Fri Nov 02 2012 Bohuslav Kabrda <bkabrda@redhat.com> - 1.6.5-4
188 192
 - Use the -java gem to get separate gemspec for JRuby ext.
189 193
 - Utilize new RubyGems JRuby macros.
3  rubygems/operating_system.rb
@@ -3,12 +3,13 @@ class << self
3 3
 
4 4
     ##
5 5
     # Returns full path of previous but one directory of dir in path
6  
-    # E.g. for '/usr/share/jruby', 'jruby', it returns '/usr'
  6
+    # E.g. for '/usr/share/ruby', 'ruby', it returns '/usr'
7 7
 
8 8
     def previous_but_one_dir_to(path, dir)
9 9
       split_path = path.split(File::SEPARATOR)
10 10
       File.join(split_path.take_while { |one_dir| one_dir !~ /^#{dir}$/ }[0..-2])
11 11
     end
  12
+    private :previous_but_one_dir_to
12 13
 
13 14
     ##
14 15
     # Default gems locations allowed on FHS system (/usr, /usr/share).

No commit comments for this range

Something went wrong with that request. Please try again.