packages: ruby-nokogiri/ruby-nokogiri.spec, ruby-nokogiri/ruby-nokogiri-bin...

[aredridel]

Author: aredridel                    Date: Sat Aug 28 19:09:08 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 1.4.3.1
- fix path to so file require

---- Files affected:
packages/ruby-nokogiri:
   ruby-nokogiri.spec (1.6 -> 1.7) , ruby-nokogiri-binpath.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/ruby-nokogiri/ruby-nokogiri.spec
diff -u packages/ruby-nokogiri/ruby-nokogiri.spec:1.6 packages/ruby-nokogiri/ruby-nokogiri.spec:1.7
--- packages/ruby-nokogiri/ruby-nokogiri.spec:1.6	Tue Apr  6 16:24:45 2010
+++ packages/ruby-nokogiri/ruby-nokogiri.spec	Sat Aug 28 21:09:02 2010
@@ -1,20 +1,25 @@
 # $Revision$, $Date$
-%define pkgname nokogiri
+
+%define gitrev 6dbda31
+%define gitauthor tenderlove
+%define gitproject nokogiri
+
 Summary:	An HTML, XML, SAX, and Reader parser
-Name:		ruby-%{pkgname}
-Version:	1.4.1
+Name:		ruby-nokogiri
+Version:	1.4.3.1
 Release:	1
 License:	Ruby's
 Group:		Development/Languages
-Source0:	http://rubygems.org/downloads/%{pkgname}-%{version}.gem
-# Source0-md5:	13405908a02c71daf1f302392ffa1507
-Patch0:		%{name}-cleanup.patch
-URL:		http://nokogiri.rubyforge.org/
+Source0:	http://download.github.com/%{gitauthor}-%{gitproject}-REL_%{version}-0-g%{gitrev}.tar.gz
+# Source0-md5:	520dec8ef8ac1c7ca42f508ed016784d
+Patch0:		%{name}-binpath.patch
+URL:		http://nokogiri.org/
 BuildRequires:	libxml2-devel
 BuildRequires:	libxslt-devel
 BuildRequires:	rpmbuild(macros) >= 1.277
 BuildRequires:	ruby-devel
-BuildRequires:	setup.rb >= 3.3.1
+BuildRequires:	setup.rb = 3.4.1
+%{?ruby_mod_ver_requires_eq}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -53,20 +58,17 @@
 Dokumentacji w formacie ri dla %{pkgname}.
 
 %prep
-%setup -q -c
-%{__tar} xf %{SOURCE0} -O data.tar.gz | %{__tar} xz
-find -newer README.rdoc -o -print | xargs touch --reference %{SOURCE0}
+%setup -q -n %{gitauthor}-%{gitproject}-17c2ced
 %patch0 -p1
-
+find -newer README.rdoc -o -print | xargs touch --reference %{SOURCE0}
 cp %{_datadir}/setup.rb .
-
-%build
 ruby setup.rb config \
-	--rbdir=%{ruby_rubylibdir} \
-	--sodir=%{ruby_archdir}
-
+	--installdirs=std
 ruby setup.rb setup
 
+racc -l -o lib/nokogiri/css/generated_parser.rb lib/nokogiri/css/parser.y
+rex --independent -o lib/nokogiri/css/generated_tokenizer.rb lib/nokogiri/css/tokenizer.rex
+
 rdoc --op rdoc lib
 rdoc --ri --op ri lib
 rm ri/created.rid
@@ -107,6 +109,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2010/08/28 19:09:02  aredridel
+- 1.4.3.1
+- fix path to so file require
+
 Revision 1.6  2010/04/06 14:24:45  sparky
 - BR: ruby-devel
 

================================================================
Index: packages/ruby-nokogiri/ruby-nokogiri-binpath.patch
diff -u /dev/null packages/ruby-nokogiri/ruby-nokogiri-binpath.patch:1.1
--- /dev/null	Sat Aug 28 21:09:08 2010
+++ packages/ruby-nokogiri/ruby-nokogiri-binpath.patch	Sat Aug 28 21:09:02 2010
@@ -0,0 +1,12 @@
+diff -ur tenderlove-nokogiri-17c2ced-o/lib/nokogiri.rb tenderlove-nokogiri-17c2ced/lib/nokogiri.rb
+--- tenderlove-nokogiri-17c2ced-o/lib/nokogiri.rb	2010-08-28 11:56:17.000000000 -0600
++++ tenderlove-nokogiri-17c2ced/lib/nokogiri.rb	2010-08-28 13:05:45.000000000 -0600
+@@ -10,7 +10,7 @@
+   require 'ffi'
+   require 'nokogiri/ffi/libxml'
+ else
+-  require 'nokogiri/nokogiri'
++  require 'nokogiri.so'
+ end
+ 
+ warn(<<-eowarn) if '1.8.6' == RUBY_VERSION && $VERBOSE
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ruby-nokogiri/ruby-nokogiri.spec?r1=1.6&r2=1.7&f=u