From: Caleb Maclennan <caleb@alerque.com>
Date: Mon, 3 May 2010 10:54:56 +0000 (+0000)
Subject: - made patch portable across ruby versions per suggestion from radek
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fflvtool2.git;a=commitdiff_plain;h=e2d8a72cc923a04116b69cd4d883a8f3278ed35f

- made patch portable across ruby versions per suggestion from radek

Changed files:
    flvtool2-ruby19.patch -> 1.2
---

diff --git a/flvtool2-ruby19.patch b/flvtool2-ruby19.patch
index bb65a00..b01e25a 100644
--- a/flvtool2-ruby19.patch
+++ b/flvtool2-ruby19.patch
@@ -1,10 +1,12 @@
 --- flvtool2-1.0.6/setup.rb~	2006-10-10 23:46:57.000000000 +0300
-+++ flvtool2-1.0.6/setup.rb	2010-05-01 14:11:48.846696545 +0300
-@@ -1311,6 +1311,7 @@
++++ flvtool2-1.0.6/setup.rb	2010-05-03 13:51:01.395678449 +0300
+@@ -1311,6 +1311,9 @@
        File.open(path) {|f|
          line = f.gets
        }
-+      line.force_encoding('ASCII-8BIT')
++	  if RUBY_VERSION >= "1.9"
++		  line.force_encoding('ASCII-8BIT')
++	  end
        return nil unless /\A#!/ =~ line
        parse(line)
      end