[rubygem-json: 7/7] Merge remote branch 'remotes/origin/f13/master'

[Xavier LAMIEN]

commit ca07723cf936a6caac0281934c630797a7fc702d
Merge: ea5348c 2d896e9
Author: Xavier Lamien <laxathom at fedoraproject.org>
Date:   Sat Sep 18 16:42:29 2010 +0200

    Merge remote branch 'remotes/origin/f13/master'

 rubygem-json.spec |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)
---
diff --cc rubygem-json.spec
index cef17df,376169c..d9975dc
--- a/rubygem-json.spec
+++ b/rubygem-json.spec
@@@ -8,8 -8,8 +8,9 @@@
  
  
  Name:           rubygem-%{gemname}
 -Version:        1.4.3
 -Release:        3%{?dist}
 +Version:        1.4.6
 +Release:        1%{?dist}
++
  Summary:        A JSON implementation in Ruby
  
  Group:          Development/Languages
@@@ -215,13 -214,16 +225,20 @@@ pop
  %files -n   rubygem-%{gemname}-gui
  %defattr(-,root,root,-)
  %{_bindir}/edit_json.rb
- %{ruby_sitelib}/%{gemname}/editor.rb
  %{geminstdir}/lib/%{gemname}/editor.rb
  
+ %files -n   ruby-%{gemname}-gui
+ %defattr(-,root,root,-)
+ %{ruby_sitelib}/%{gemname}/editor.rb
+ 
  
  %changelog
 +* Sat Sep 18 2010 Xavier Lamien <laxathom at fedoraproject.org> - 1.4.6-1
 +- Update release.
++- Enabled test stage.
++
+ * Fri Jun 11 2010 Xavier Lamien <laxathom at fedoraproject.org> - 1.4.3-3
+ - Move ruby's site_lib editor to ruby-json-gui.
  
  * Mon May 10 2010 Xavier Lamien <laxathom at fedoraproject.org> - 1.4.3-2
  - Move editor out of ruby-json sub-package.