From 30b2b1a40ecc09d06e66b8c48bda5de411979e49 Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Sat, 1 May 2010 11:14:48 +0000 Subject: [PATCH] - up to 1.0.6 final - patched setup script to run on ruby-1.9 Changed files: flvtool2-ruby19.patch -> 1.1 flvtool2.spec -> 1.11 --- flvtool2-ruby19.patch | 10 ++++++++++ flvtool2.spec | 11 ++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 flvtool2-ruby19.patch diff --git a/flvtool2-ruby19.patch b/flvtool2-ruby19.patch new file mode 100644 index 0000000..bb65a00 --- /dev/null +++ b/flvtool2-ruby19.patch @@ -0,0 +1,10 @@ +--- 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 @@ + File.open(path) {|f| + line = f.gets + } ++ line.force_encoding('ASCII-8BIT') + return nil unless /\A#!/ =~ line + parse(line) + end diff --git a/flvtool2.spec b/flvtool2.spec index 5ee8389..7437775 100644 --- a/flvtool2.spec +++ b/flvtool2.spec @@ -1,14 +1,14 @@ -%define _rc rc6 Summary: Manipulation tool for Macromedia Flash Video files Summary(pl.UTF-8): Narzędzie do obróbki plików Macromedia Flash Video Name: flvtool2 -Version: 1.0.5 +Version: 1.0.6 Release: 1 License: BSD Group: Applications/Multimedia -Source0: http://rubyforge.org/frs/download.php/9225/%{name}_%{version}_%{_rc}.tgz -# Source0-md5: 6cf448db50936251992b4812b6381f69 +Source0: http://rubyforge.org/frs/download.php/17497/%{name}-%{version}.tgz +# Source0-md5: 08e5f6f10c06903447d97d7ba10cec67 URL: http://rubyforge.org/projects/flvtool2/ +Patch0: %{name}-ruby19.patch BuildRequires: rpmbuild(macros) >= 1.279 BuildRequires: ruby BuildRequires: ruby-modules @@ -30,7 +30,8 @@ strukturę FLV i wypisywać informacje o metadanych w formacie XML lub YAML. %prep -%setup -q -n %{name}_%{version}_%{_rc} +%setup -q -n %{name}-%{version} +%patch0 -p1 %build ruby setup.rb config \ -- 2.43.0