packages: ruby-diff-lcs/ruby-diff-lcs-nogems.patch, ruby-diff-lcs/ruby-diff...
baggins
baggins at pld-linux.org
Mon Mar 1 21:55:04 CET 2010
Author: baggins Date: Mon Mar 1 20:55:04 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 1.1.2
- updated build
- added rdoc and ri packages
---- Files affected:
packages/ruby-diff-lcs:
ruby-diff-lcs-nogems.patch (1.1 -> 1.2) , ruby-diff-lcs.spec (1.18 -> 1.19)
---- Diffs:
================================================================
Index: packages/ruby-diff-lcs/ruby-diff-lcs-nogems.patch
diff -u packages/ruby-diff-lcs/ruby-diff-lcs-nogems.patch:1.1 packages/ruby-diff-lcs/ruby-diff-lcs-nogems.patch:1.2
--- packages/ruby-diff-lcs/ruby-diff-lcs-nogems.patch:1.1 Mon Oct 18 08:43:49 2004
+++ packages/ruby-diff-lcs/ruby-diff-lcs-nogems.patch Mon Mar 1 21:54:59 2010
@@ -1,7 +1,7 @@
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,13 +13,7 @@
+@@ -13,14 +13,8 @@
# $Id$
#++
@@ -10,8 +10,10 @@
- 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'
================================================================
Index: packages/ruby-diff-lcs/ruby-diff-lcs.spec
diff -u packages/ruby-diff-lcs/ruby-diff-lcs.spec:1.18 packages/ruby-diff-lcs/ruby-diff-lcs.spec:1.19
--- packages/ruby-diff-lcs/ruby-diff-lcs.spec:1.18 Sat Feb 27 20:17:36 2010
+++ packages/ruby-diff-lcs/ruby-diff-lcs.spec Mon Mar 1 21:54:59 2010
@@ -3,17 +3,16 @@
Summary: a Ruby port of Algorithm::Diff
Summary(pl.UTF-8): Port Algorithm::Diff dla języka Ruby
Name: ruby-%{pkgname}
-Version: 1.1.1
-Release: 4
+Version: 1.1.2
+Release: 1
License: GPL
Group: Development/Libraries
-Source0: http://rubyforge.org/frs/download.php/1533/%{pkgname}-%{version}.tar.gz
-# Source0-md5: ecea8ae3b8823e740ef6cbef84495245
-Source1: setup.rb
+Source0: http://rubygems.org/downloads/%{pkgname}-%{version}.gem
+# Source0-md5: 60524d29b37f76d56ce835323e324879
Patch0: %{name}-nogems.patch
URL: http://raa.ruby-lang.org/project/diff-lcs/
-BuildRequires: rpmbuild(macros) >= 1.277
-BuildRequires: pax
+BuildRequires: rpmbuild(macros) >= 1.484
+BuildRequires: ruby >= 1:1.8.6
BuildRequires: ruby-modules
%{?ruby_mod_ver_requires_eq}
Obsoletes: ruby-Diff-LCS
@@ -35,6 +34,30 @@
autorstwa Mario I. Wolczko (1.2 z roku 1993) i wersji dla Perla
autorstwa Neda Konza (Algorithm::Diff).
+%package rdoc
+Summary: HTML documentation for %{pkgname}
+Summary(pl.UTF-8): Dokumentacja w formacie HTML dla %{pkgname}
+Group: Documentation
+Requires: ruby >= 1:1.8.7-4
+
+%description rdoc
+HTML documentation for %{pkgname}.
+
+%description rdoc -l pl.UTF-8
+Dokumentacja w formacie HTML dla %{pkgname}.
+
+%package ri
+Summary: ri documentation for %{pkgname}
+Summary(pl.UTF-8): Dokumentacja w formacie ri dla %{pkgname}
+Group: Documentation
+Requires: ruby
+
+%description ri
+ri documentation for %{pkgname}.
+
+%description ri -l pl.UTF-8
+Dokumentacji w formacie ri dla %{pkgname}.
+
%package -n htmldiff
Summary: Tool to find differences in HTML files
Summary(pl.UTF-8): Narzędzie do znajdowania różnic w plikach HTML
@@ -59,35 +82,29 @@
Narzędzie Ruby Diff.
%prep
-rm -rf diff-lcs-%{version}
-# use pax because dirs in tar file are read-only, preventing extraction
-gunzip -c %{SOURCE0} | pax -r -v
-chmod -R u+rw diff-lcs-%{version}
-%setup -q -D -T -n diff-lcs-%{version}
+%setup -q -c
+%{__tar} xf %{SOURCE0} -O data.tar.gz | %{__tar} xz
+find -newer README -o -print | xargs touch --reference %{SOURCE0}
%patch0 -p1
-cp %{SOURCE1} .
+%{__sed} -i -e 's|/usr/bin/env ruby|%{__ruby}|' bin/*diff
%build
-ruby setup.rb config \
- --siterubyver=%{ruby_rubylibdir} \
- --sodir=%{ruby_archdir}
-
-ruby setup.rb setup
-rdoc --inline-source --op rdoc lib
rdoc --ri --op ri lib
-
-rm ri/Array/cdesc-Array.yaml
-rm ri/String/cdesc-String.yaml
+rdoc --op rdoc lib
+rm -r ri/{Array,String}
+rm ri/created.rid
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{ruby_rubylibdir},%{ruby_ridir}}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{ruby_rubylibdir},%{ruby_ridir},%{ruby_rdocdir}}
-ruby setup.rb install \
- --prefix=$RPM_BUILD_ROOT
+install bin/htmldiff $RPM_BUILD_ROOT%{_bindir}
+install bin/ldiff $RPM_BUILD_ROOT%{_bindir}
+cp -a lib/* $RPM_BUILD_ROOT%{ruby_rubylibdir}
cp -a ri/* $RPM_BUILD_ROOT%{ruby_ridir}
+cp -a rdoc $RPM_BUILD_ROOT%{ruby_rdocdir}/%{name}-%{version}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -95,7 +112,14 @@
%files
%defattr(644,root,root,755)
%{ruby_rubylibdir}/*
-%{ruby_ridir}/*
+
+%files rdoc
+%defattr(644,root,root,755)
+%{ruby_rdocdir}/%{name}-%{version}
+
+%files ri
+%defattr(644,root,root,755)
+%{ruby_ridir}/Diff
%files -n htmldiff
%defattr(644,root,root,755)
@@ -111,6 +135,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.19 2010/03/01 20:54:59 baggins
+- up to 1.1.2
+- updated build
+- added rdoc and ri packages
+
Revision 1.18 2010/02/27 19:17:36 baggins
- P:ruby-Diff-LCS
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ruby-diff-lcs/ruby-diff-lcs-nogems.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ruby-diff-lcs/ruby-diff-lcs.spec?r1=1.18&r2=1.19&f=u
More information about the pld-cvs-commit
mailing list