[rubygem-ruby-debug] - Try using latest svn

[Mamoru Tasaka]

commit 3cfdd8412e8a7f88e33d2a7f3350614e6779b2b1
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Tue Sep 21 02:11:05 2010 +0900

    - Try using latest svn

 .gitignore              |    1 +
 rubygem-ruby-debug.spec |   46 ++++++++++++++++++++++++++++++++--------------
 sources                 |    2 +-
 3 files changed, 34 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3aaabaa..472ef43 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /ruby-debug-0.10.4rc1.tgz
+/ruby-debug-0.10.4svn952_trunk.tar.gz
diff --git a/rubygem-ruby-debug.spec b/rubygem-ruby-debug.spec
index d0f36a5..a25672e 100644
--- a/rubygem-ruby-debug.spec
+++ b/rubygem-ruby-debug.spec
@@ -4,13 +4,20 @@
 %global	majorver	0.10.4
 %global	preminorver	rc1
 
-%global	mainrel	3
+# Upstream SCM: using SVN
+# SVN path: svn://rubyforge.org/var/svn/ruby-debug/trunk
+# tar czf %%gemname-%%majorver%%preminorver.tar.gz trunk/
+%global	using_svn	1
+%if 0%{?using_svn} > 0
+%global	svnver		svn952_trunk
+%global	preminorver	%(echo %svnver | sed -e 's|_trunk||')
+%endif
 
 %global	gemdir		%(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
 %global	gemname	ruby-debug
 %global	geminstdir	%{gemdir}/gems/%{gemname}-%{majorver}%{?preminorver}
 
-%global	rubyabi	1.8
+%global	mainrel	4
 
 Summary:	Command line interface (CLI) for ruby-debug-base
 Name:		rubygem-%{gemname}
@@ -19,16 +26,17 @@ Release:	%{?preminorver:0.}%{mainrel}%{?preminorver:.%preminorver}%{?dist}
 Group:		Development/Languages
 License:	BSD
 URL:		http://rubyforge.org/projects/ruby-debug/
+%if 0%{?using_svn}
+Source0:	%{gemname}-%{majorver}%{?svnver}.tar.gz
+%else
 #Source0:	http://rubygems.org/gems/%%{gemname}-%%{version}.gem
 # rc release not hosted on rubygems.org yet, using rubyforge.org site
 # Also gem is not released for rc version, so for now using tar ball
 Source0:	http://rubyforge.org/frs/download.php/%{repoid}/%{gemname}-%{majorver}%{?preminorver}.tgz
-# Use system wide ruby-debug-base
-Patch0:	ruby-debug-0.10.4rc1-use-system-base-gem.patch
+%endif
+Patch0:	ruby-debug-rev950-raketask_without_VERSION.patch
 # Fix test failure
 Patch1:	ruby-debug-0.10.4rc1-tast-failure.patch
-# Patch from trunk: fix shebang
-Patch2:	ruby-debug-0.10.4-rc1-rev948-shebang-misspell.patch
 
 Requires:	ruby(abi) = %{rubyabi}
 Requires:	rubygem(columnize)
@@ -58,15 +66,18 @@ Requires:	%{name} = %{version}-%{release}
 This package contains documentation for %{name}.
 
 %prep
-##%setup -q -c -T
-%setup -q -c -T -a 0
+%setup -q -c -T
 
+tar xzf %{SOURCE0}
 # As rc version of gem is not released yet, now creating gem from tarball
-pushd %{gemname}-%{majorver}%{?preminorver}/
-## No backup
-%patch0 -p1
-%patch1 -p1
-%patch2 -p0
+#pushd %{gemname}-%{majorver}%{?preminorver}/
+pushd trunk
+
+# Fix version (until formal gem or tarball is released by upstream)
+sed -i.ver \
+	-e '/DEBUG_VERSION/s|"%{majorver}.*"|"%{majorver}%{?preminorver}"|' \
+	ext/ruby_debug.c
+
 rake --verbose pkg/ruby-debug-%{majorver}%{?preminorver}.gem
 popd
 
@@ -80,7 +91,7 @@ gem install \
 %if 0
 	%{SOURCE0}
 %else
-	%{gemname}-%{majorver}%{?preminorver}/pkg/ruby-debug-%{majorver}%{?preminorver}.gem
+	*/pkg/ruby-debug-%{majorver}%{?preminorver}.gem
 %endif
 
 # rpmlint issue / cleanups
@@ -91,6 +102,9 @@ rm -f .%{geminstdir}/.require_paths
 # Removing shebangs on non-executable files in test/ breaks test, so not fixing this
 # Also zero-length files are needed for test
 
+# ???
+%_fixperms .
+
 %build
 
 %install
@@ -132,10 +146,14 @@ popd
 %{gemdir}/doc/%{gemname}-%{majorver}%{?preminorver}/
 %{geminstdir}/Rakefile
 %{geminstdir}/rdbg.rb
+%{geminstdir}/runner.sh
 %{geminstdir}/doc/
 %{geminstdir}/test/
 
 %changelog
+* Tue Sep 21 2010  Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.10.4-0.4.svn952_trunk
+- Try using latest svn
+
 * Mon Sep 13 2010  Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.10.4-0.3.rc1
 - Fix shebang
 
diff --git a/sources b/sources
index b409405..be3ebc5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-856931094f2f8c780cf3596843b75f17  ruby-debug-0.10.4rc1.tgz
+8ab59c215c2b7b139fd20b3c84997825  ruby-debug-0.10.4svn952_trunk.tar.gz