- ruby19 patch

- sqlite3-ruby used by db/commitset

Changed files:
    fromcvs.spec -> 1.3
    ruby19.patch -> 1.1

diff --git a/fromcvs.spec b/fromcvs.spec
index e745e877d5247f5e911bca6b736f81b6199fd944..f06d05e626aabfe300e009cf1d6c423070c41ff1 100644 (file)
--- a/fromcvs.spec
+++ b/fromcvs.spec
@@ -6,12 +6,15 @@ License:      GPL
 Group:         Development
 Source0:       http://ww2.fs.ei.tum.de/~corecode/hg/fromcvs/archive/tip.tar.bz2#/%{name}.tbz2
 # Source0-md5: 65a791705a1f6a7b5fd718c1af76695e
+Patch0:                ruby19.patch
 URL:           http://ww2.fs.ei.tum.de/~corecode/hg/fromcvs/
 BuildRequires: sed >= 4.0
 Requires:      ruby >= 1.8.5
 Requires:      ruby-rbtree
 Requires:      ruby-rcsparse
-Requires:      sqlite3-ruby
+# for db/commitset - not packaged
+#Suggests:     sqlite3-ruby
+# for togit
 Suggests:      git-core >= 1.5
 #BuildArch:    noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -26,6 +29,7 @@ there is a hg and git destination available.
 %prep
 %setup -qc
 mv %{name}-*/* .
+%patch0 -p1
 
 # setup shebang
 %{__sed} -i -e '1i#!%{__ruby}' to*.rb

diff --git a/ruby19.patch b/ruby19.patch
new file mode 100644 (file)
index 0000000..12dd41d
--- /dev/null
+++ b/ruby19.patch
@@ -0,0 +1,20 @@
+--- fromcvs-0.1/fromcvs.rb~    2009-04-18 20:02:40.000000000 +0300
++++ fromcvs-0.1/fromcvs.rb     2011-02-08 01:52:51.778638228 +0200
+@@ -1,6 +1,6 @@
+ require 'rcsfile'
+ require 'find'
+-require 'md5'
++require 'digest/md5'
+ require 'rbtree'
+ require 'iconv'
+ require 'getoptlong'
+--- fromcvs-0.1/commitset/commitset.rb~        2009-04-18 20:02:40.000000000 +0300
++++ fromcvs-0.1/commitset/commitset.rb 2011-02-08 01:53:35.161078748 +0200
+@@ -1,6 +1,6 @@
+ require 'rcsfile'
+ require 'find'
+-require 'md5'
++require 'digest/md5'
+ require 'sqlite3'
+ 
+ # Fix up SQLite3