[packages/ruby-diff-lcs] up to 1.1.3

glen glen at pld-linux.org
Sun May 5 20:05:03 CEST 2013


commit 9d04280368ebd3c2df12e445e6766824c9efe158
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun May 5 21:03:12 2013 +0300

    up to 1.1.3

 ruby-diff-lcs-nogems.patch | 69 ----------------------------------------------
 ruby-diff-lcs.spec         | 22 ++++-----------
 2 files changed, 6 insertions(+), 85 deletions(-)
---
diff --git a/ruby-diff-lcs.spec b/ruby-diff-lcs.spec
index d1be502..d3c141f 100644
--- a/ruby-diff-lcs.spec
+++ b/ruby-diff-lcs.spec
@@ -2,19 +2,15 @@
 Summary:	a Ruby port of Algorithm::Diff
 Summary(pl.UTF-8):	Port Algorithm::Diff dla języka Ruby
 Name:		ruby-%{pkgname}
-Version:	1.1.2
-Release:	3
+Version:	1.1.3
+Release:	1
 License:	GPL v2+ or Ruby or Artistic
 Group:		Development/Libraries
 Source0:	http://rubygems.org/downloads/%{pkgname}-%{version}.gem
-# Source0-md5:	60524d29b37f76d56ce835323e324879
-Patch0:		%{name}-nogems.patch
-URL:		http://raa.ruby-lang.org/project/diff-lcs/
+# Source0-md5:	86595b4618756d1dceac28e6104e285f
+URL:		http://diff-lcs.rubyforge.org/
 BuildRequires:	rpm-rubyprov
 BuildRequires:	rpmbuild(macros) >= 1.656
-%if %(locale -a | grep -q '^en_US$'; echo $?)
-BuildRequires:	glibc-localedb-all
-%endif
 Provides:	ruby-Diff-LCS
 Obsoletes:	ruby-Diff-LCS
 BuildArch:	noarch
@@ -84,17 +80,9 @@ Narzędzie Ruby Diff.
 
 %prep
 %setup -q -n %{pkgname}-%{version}
-%patch0 -p1
 %{__sed} -i -e '1 s,#!.*ruby,#!%{__ruby},' bin/*
 
-iconv -flatin1 -tutf8 lib/diff/lcs/ldiff.rb > tmp
-mv tmp lib/diff/lcs/ldiff.rb
-
-find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
-
 %build
-# docs need UTF-8 locale
-export LC_ALL=en_US.UTF-8
 rdoc --ri --op ri lib
 rdoc --op rdoc lib
 rm -r ri/{Array,String}
@@ -114,7 +102,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%doc README.rdoc History.rdoc License.rdoc
 %dir %{ruby_vendorlibdir}/diff
+%{ruby_vendorlibdir}/diff-lcs.rb
 %{ruby_vendorlibdir}/diff/lcs.rb
 %{ruby_vendorlibdir}/diff/lcs
 
diff --git a/ruby-diff-lcs-nogems.patch b/ruby-diff-lcs-nogems.patch
deleted file mode 100644
index a2f91d1..0000000
--- a/ruby-diff-lcs-nogems.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -ur diff-lcs-1.1.1-orig/bin/htmldiff diff-lcs-1.1.1/bin/htmldiff
---- diff-lcs-1.1.1-orig/bin/htmldiff	2004-10-18 00:38:45.109326185 -0600
-+++ diff-lcs-1.1.1/bin/htmldiff	2004-10-18 00:39:46.921826912 -0600
-@@ -13,14 +13,8 @@
- # $Id$
- #++
- 
--begin
--  require 'rubygems'
--  require_gem 'diff-lcs', "1.1.1"
--  require 'diff/lcs/string'
--rescue LoadError
--  require 'diff/lcs'
--  require 'diff/lcs/string'
--end
-+require 'diff/lcs'
-+require 'diff/lcs/string'
- 
- require 'text/format'
- 
-diff -ur diff-lcs-1.1.1-orig/bin/ldiff diff-lcs-1.1.1/bin/ldiff
---- diff-lcs-1.1.1-orig/bin/ldiff	2004-10-18 00:38:45.109326185 -0600
-+++ diff-lcs-1.1.1/bin/ldiff	2004-10-18 00:39:37.156537773 -0600
-@@ -13,32 +13,7 @@
- # $Id$
- #++
- 
--  # 1) Try to load Ruwiki from the gem.
--  # 2) Try to load Ruwiki from $LOAD_PATH.
--  # 3) Modify $LOAD_PATH and try to load it from the modified $LOAD_PATH.
--  # 4) Fail hard.
--load_state = 1
--  begin
--    if 1 == load_state
--      require 'rubygems'
--      require_gem 'diff-lcs', '= 1.1.1'
--    else
--      require 'diff/lcs'
--    end
--  rescue LoadError
--    load_state += 1
--
--    case load_state
--    when 3
--      $LOAD_PATH.unshift "#{File.dirname($0)}/../lib"
--    when 4
--      $LOAD_PATH.shift
--      $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../lib"
--    when 5
--      raise
--    end
--    retry
--  end
-+require 'diff/lcs'
- 
- require 'diff/lcs/ldiff'
- 
-diff -ur diff-lcs-1.1.1-orig/lib/diff/lcs/string.rb diff-lcs-1.1.1/lib/diff/lcs/string.rb
---- diff-lcs-1.1.1-orig/lib/diff/lcs/string.rb	2004-10-18 00:38:45.111326039 -0600
-+++ diff-lcs-1.1.1/lib/diff/lcs/string.rb	2004-10-18 00:39:59.044944386 -0600
-@@ -14,6 +14,8 @@
- #++
- # Includes Diff::LCS into String.
- 
-+require 'diff/lcs'
-+
- class String
-   include Diff::LCS
- end
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ruby-diff-lcs.git/commitdiff/9d04280368ebd3c2df12e445e6766824c9efe158



More information about the pld-cvs-commit mailing list