[rubygem-rubyforge/el5/master] - Update to 2.0.4 - Replace json_pure to json (bug 570252)

[Mamoru Tasaka]

commit 979b11b3df58072ee2ae3aa75579df0283523f37
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Sun Sep 19 01:28:15 2010 +0900

    - Update to 2.0.4
    - Replace json_pure to json (bug 570252)

 .gitignore             |    1 +
 rubygem-rubyforge.spec |   70 ++++++++++++++++++++++++++++++++++++++++-------
 sources                |    2 +-
 3 files changed, 61 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d781eed..811b15a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 rubyforge-1.0.1.gem
+/rubyforge-2.0.4.gem
diff --git a/rubygem-rubyforge.spec b/rubygem-rubyforge.spec
index a6a212d..05c1872 100644
--- a/rubygem-rubyforge.spec
+++ b/rubygem-rubyforge.spec
@@ -1,15 +1,18 @@
 # Generated from rubyforge-0.4.4.gem by gem2rpm -*- rpm-spec -*-
-%define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
-%define gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
-%define gemname rubyforge
-%define geminstdir %{gemdir}/gems/%{gemname}-%{version}
+%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
+%global gemname rubyforge
+%global geminstdir %{gemdir}/gems/%{gemname}-%{version}
+
+# Depency loop here. Kill test when resolving dependency loop
+# is needed
+%global enable_test 0
 
 Summary:       A script which automates a limited set of rubyforge operations
 Name:          rubygem-%{gemname}
-Version:       2.0.3
+Version:       2.0.4
 Release:       1%{?dist}
 Group:         Development/Languages
-License:       GPLv2+ or Ruby
+License:       MIT
 URL:           http://rubyforge.org/projects/codeforpeople
 Source0:       http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -17,6 +20,12 @@ Requires:      ruby(abi) = 1.8
 Requires:      rubygems
 Requires:      rubygem(json) >= 1.1.7
 BuildRequires: rubygems
+%if %{enable_test}
+BuildRequires(check): rubygem(rake)
+BuildRequires(check): rubygem(json)
+# The following line causes dependency loop
+BuildRequires(check): rubygem(hoe)
+%endif
 BuildArch:     noarch
 Provides:      rubygem(%{gemname}) = %{version}
 
@@ -25,17 +34,31 @@ A script which automates a limited set of rubyforge operations.
 
 
 %prep
+%setup -q -c -T
+
+mkdir -p ./%{gemdir}
+gem install \
+	--local \
+	--install-dir ./%{gemdir} \
+	--force \
+	--rdoc \
+	%{SOURCE0}
+
+# json_pure -> json
+find . -name Rakefile -or -name \*.gemspec | \
+	xargs sed -i -e 's|json_pure|json|g'
 
 %build
 
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}%{gemdir}
-gem install --local --install-dir %{buildroot}%{gemdir} \
-            --force --rdoc %{SOURCE0}
+cp -a .%{gemdir}/* %{buildroot}/%{gemdir}/
+
 mkdir -p %{buildroot}/%{_bindir}
 mv %{buildroot}%{gemdir}/bin/* %{buildroot}/%{_bindir}
 rmdir %{buildroot}%{gemdir}/bin
+
 find %{buildroot}%{geminstdir}/bin -type f | xargs chmod a+x
 chmod 0755 %{buildroot}%{geminstdir}/lib/rubyforge.rb
 chmod 0755 %{buildroot}%{geminstdir}/bin/rubyforge
@@ -43,19 +66,44 @@ chmod 0755 %{buildroot}%{geminstdir}/bin/rubyforge
 %clean
 rm -rf %{buildroot}
 
+%check
+%if ! %{enable_test}
+exit 0
+%endif
+
+pushd .%{gemdir}
+# Hoe needs rubyforge, so make it sure that system-widely installed
+# Hoe looks for rubyforge just trying to install now first, not
+# system-widely installed rubyforge
+export GEM_PATH=$(pwd)
+popd
+
+pushd .%{geminstdir}
+rake test
+popd
+
 %files
 %defattr(-, root, root, -)
 %{_bindir}/rubyforge
-%{gemdir}/gems/%{gemname}-%{version}/
+%dir %{geminstdir}
+%{geminstdir}/lib/
+%{geminstdir}/bin/
+%{gemdir}/cache/%{gemname}-%{version}.gem
+%{gemdir}/specifications/%{gemname}-%{version}.gemspec
+
 %doc %{gemdir}/doc/%{gemname}-%{version}
 %doc %{geminstdir}/History.txt
 %doc %{geminstdir}/Manifest.txt
 %doc %{geminstdir}/README.txt
-%{gemdir}/cache/%{gemname}-%{version}.gem
-%{gemdir}/specifications/%{gemname}-%{version}.gemspec
+%doc %{geminstdir}/Rakefile
+%doc %{geminstdir}/test/
 
 
 %changelog
+* Thu Mar  4 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.4-1
+- Update to 2.0.4
+- Replace json_pure to json (bug 570252)
+
 * Mon Feb 15 2010 Darryl L. Pierce <dpierce at redhat.com> - 2.0.3-1
 - Added new dependency on rubygem-json >= 1.1.7.
 - Release 2.0.3 of RubyForge.
diff --git a/sources b/sources
index ac4dd83..bb7421c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ed81b2f1d82dce6fd3f5be56a8f2f739  rubyforge-2.0.3.gem
+c1793a26ba6cbe3dfdf6d9fa242f2428  rubyforge-2.0.4.gem