Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Rename the JRuby dirs to contain _jruby suffixes instead of _java

  • Loading branch information...
commit 453cbd787f8913b70a3f47fc83a17a86633729a2 1 parent 240e868
@bkabrda authored
Showing with 10 additions and 7 deletions.
  1. +10 −7 rubygems/rubygems.spec
View
17 rubygems/rubygems.spec
@@ -28,7 +28,7 @@
Summary: The Ruby standard for packaging ruby libraries
Name: rubygems
Version: 1.8.24
-Release: 5%{?dist}
+Release: 6%{?dist}
Group: Development/Libraries
License: Ruby or MIT
@@ -172,12 +172,12 @@ cat >> %{buildroot}%{_sysconfdir}/rpm/macros.rubygems << \EOF
%%gem_spec %%{gem_dir}/specifications/%%{gem_name}-%%{version}.gemspec
%%gem_docdir %%{gem_dir}/doc/%%{gem_name}-%%{version}
# for JRuby
-%%gem_instdir_java %%{gem_dir}/gems/%%{gem_name}-%%{version}-java
-%%gem_extdir_jruby %%{gem_dir}/jruby/%%{gem_name}-%%{version}
-%%gem_extdir_java %%{gem_extdir_jruby}-java
-%%gem_libdir_java %%{gem_instdir_java}/lib
-%%gem_cache_java %%{gem_dir}/cache/%%{gem_name}-%%{version}-java.gem
-%%gem_spec_java %%{gem_dir}/specifications/%%{gem_name}-%%{version}-java.gemspec
+%%gem_instdir_jruby %%{gem_dir}/gems/%%{gem_name}-%%{version}-java
+%%gem_extdir_jruby_pure %%{gem_dir}/jruby/%%{gem_name}-%%{version}
+%%gem_extdir_jruby %%{gem_extdir_jruby_pure}-java
+%%gem_libdir_jruby %%{gem_instdir_jruby}/lib
+%%gem_cache_jruby %%{gem_dir}/cache/%%{gem_name}-%%{version}-java.gem
+%%gem_spec_jruby %%{gem_dir}/specifications/%%{gem_name}-%%{version}-java.gemspec
EOF
%if %{enable_check}
@@ -227,6 +227,9 @@ testrb test
%config(noreplace) %{_sysconfdir}/rpm/macros.rubygems
%changelog
+* Tue Dec 04 2012 Bohuslav Kabrda <bkabrda@redhat.com> - 1.8.24-6
+- Rename the JRuby macros to use _jruby suffixes, not _java.
+
* Thu Nov 22 2012 Bohuslav Kabrda <bkabrda@redhat.com> - 1.8.24-5
- Refine and add new JRuby macros.
Please sign in to comment.
Something went wrong with that request. Please try again.