commit aa6f2a3fdd245997a86500eb036ce3d76074e36d
parent ee9349d375799a274d54ab80d8be3d6279870d70
Author: Eric Weikl <eric.weikl@gmx.net>
Date: Tue, 18 Jun 2013 19:06:59 +0200
Merge branch 'sup-heliotrope/develop' into maildir-sync
Diffstat:
3 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/lib/sup.rb b/lib/sup.rb
@@ -4,7 +4,7 @@ YAML::ENGINE.yamler = 'psych'
require 'zlib'
require 'thread'
require 'fileutils'
-require 'gettext'
+require 'locale'
require 'curses'
require 'rmail'
begin
diff --git a/lib/sup/index.rb b/lib/sup/index.rb
@@ -11,8 +11,15 @@ require "sup/hook"
require "sup/logger/singleton"
-if ([Xapian.major_version, Xapian.minor_version, Xapian.revision] <=> [1,2,1]) < 0
- fail "Xapian version 1.2.1 or higher required"
+if ([Xapian.major_version, Xapian.minor_version, Xapian.revision] <=> [1,2,15]) < 0
+ fail <<-EOF
+\n
+Xapian version 1.2.15 or higher required.
+If you have xapian-full-alaveteli installed,
+Please remove it by running `gem uninstall xapian-full-alaveteli`
+since it's been replaced by the xapian-ruby gem.
+
+ EOF
end
module Redwood
diff --git a/sup.gemspec b/sup.gemspec
@@ -43,19 +43,19 @@ SUP: Please run `sup-psych-ify-config-files` to migrate from 0.13 to 0.14
s.required_ruby_version = '>= 1.9.2'
- s.add_dependency "xapian-full-alaveteli", "~> 1.2"
- s.add_dependency "ncursesw-sup", "~> 1.3", ">= 1.3.1"
- s.add_dependency "rmail", ">= 0.17"
- s.add_dependency "highline"
- s.add_dependency "trollop", ">= 1.12"
- s.add_dependency "lockfile"
- s.add_dependency "mime-types", "~> 1"
- s.add_dependency "gettext"
- s.add_dependency "chronic", "~> 0.9", ">= 0.9.1"
+ s.add_runtime_dependency "xapian-ruby", "~> 1.2.15"
+ s.add_runtime_dependency "ncursesw-sup", "~> 1.3.1"
+ s.add_runtime_dependency "rmail", ">= 0.17"
+ s.add_runtime_dependency "highline"
+ s.add_runtime_dependency "trollop", ">= 1.12"
+ s.add_runtime_dependency "lockfile"
+ s.add_runtime_dependency "mime-types", "~> 1.0"
+ s.add_runtime_dependency "locale", "~> 2.0"
+ s.add_runtime_dependency "chronic", "~> 0.9.1"
s.add_development_dependency "bundler", "~> 1.3"
s.add_development_dependency "rake"
- s.add_development_dependency "minitest", "~> 4"
- s.add_development_dependency "rr", "~> 1.0"
+ s.add_development_dependency "minitest", "~> 4.7"
+ s.add_development_dependency "rr", "~> 1.0.5"
end
end