Resolved parslet dep conflicts with sdp

tindron · Dec 2, 2011 · 44559fc · 44559fc
1 parent 3dc0dd5
commit 44559fc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/ChangeLog.rdoc b/ChangeLog.rdoc
@@ -1,3 +1,7 @@
+
+* Laxed dependency requirement on parslet.
+* Bumped dependency requirement on sdp to ~> 0.2.6, due to parslet conflicts
+
 === 0.2.2 / 2011-11-02
 
 * Added a queue for listening and building the RTP file from the received data.

diff --git a/rtsp.gemspec b/rtsp.gemspec
@@ -22,9 +22,8 @@ For more information see: http://www.ietf.org/rfc/rfc2326.txt}
       "LICENSE.rdoc",
       "README.rdoc"
   ]
-  s.files = Dir.glob("{lib,bin,tasks}/**/*") +
-    %w(.gemtest rtsp.gemspec) +
-    %w(Gemfile ChangeLog.rdoc LICENSE.rdoc README.rdoc Rakefile)
+  s.files = Dir.glob("{lib,bin,tasks}/**/*") + Dir.glob("*.rdoc") +
+    %w(.gemtest rtsp.gemspec Gemfile Rakefile)
   s.homepage = %q{http://rubygems.org/gems/rtsp}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
@@ -33,8 +32,8 @@ For more information see: http://www.ietf.org/rfc/rfc2326.txt}
   s.summary = %q{Library to allow RTSP streaming from RTSP-enabled devices.}
   s.test_files = Dir.glob("{spec,features}/**/*")
 
-  s.add_runtime_dependency(%q<parslet>, ["~> 1.1.0"])
-  s.add_runtime_dependency(%q<sdp>, ["~> 0.2.2"])
+  s.add_runtime_dependency(%q<parslet>, [">= 1.1.0"])
+  s.add_runtime_dependency(%q<sdp>, ["~> 0.2.6"])
 
   s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
   s.add_development_dependency(%q<code_statistics>, ["~> 0.2.13"])