rpms/rubygem-nokogiri/EL-5 .cvsignore, 1.10, 1.11 rubygem-nokogiri.spec, 1.14, 1.15 sources, 1.10, 1.11

[tremble]

Author: tremble

Update of /cvs/pkgs/rpms/rubygem-nokogiri/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19107

Modified Files:
	.cvsignore rubygem-nokogiri.spec sources 
Log Message:
Revert rubygem-nokogiri back to the last version that will build under EPEL (1.3.1)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-nokogiri/EL-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	15 Dec 2009 07:09:01 -0000	1.10
+++ .cvsignore	15 Mar 2010 15:07:20 -0000	1.11
@@ -1 +1 @@
-nokogiri-1.4.1.gem
+nokogiri-1.3.1.gem


Index: rubygem-nokogiri.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-nokogiri/EL-5/rubygem-nokogiri.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- rubygem-nokogiri.spec	15 Dec 2009 07:09:01 -0000	1.14
+++ rubygem-nokogiri.spec	15 Mar 2010 15:07:20 -0000	1.15
@@ -6,13 +6,9 @@
 %define	gemname		nokogiri
 %define	geminstdir		%{gemdir}/gems/%{gemname}-%{version}
 
-# Note for packager:
-# Check if we can update nokogiri to 1.4.0 on < F-12:
-# It seems that some functions will be removed on 1.4.0
-
 Summary:	An HTML, XML, SAX, and Reader parser
 Name:		rubygem-%{gemname}
-Version:	1.4.1
+Version:	1.3.1
 Release:	1%{?dist}
 Group:		Development/Languages
 License:	MIT
@@ -23,10 +19,9 @@ BuildRoot:	%{_tmppath}/%{name}-%{version
 BuildRequires:	ruby(abi) = %{rubyabi}
 BuildRequires:	ruby(rubygems)
 BuildRequires:	rubygem(hoe)
-# Not available yet
-# BuildRequires:	rubygem(hoe-debugging)
 BuildRequires:	rubygem(rake)
-BuildRequires:	rubygem(rake-compiler)
+# Not available yet
+# BuildRequires(check):	rubygem(rake-compiler)
 BuildRequires:	libxml2-devel
 BuildRequires:	libxslt-devel
 BuildRequires:	ruby-devel
@@ -63,6 +58,7 @@ This package provides non-Gem support fo
 %prep
 %setup -q -T -c
 
+%build
 mkdir -p ./%{gemdir}
 export CONFIGURE_ARGS="--with-cflags='%{optflags}'"
 gem install \
@@ -71,12 +67,14 @@ gem install \
 	-V --force \
 	%{SOURCE0}
 
-%build
 # cflags wrong (-O3 passed), recompiling
+# Skip until rubygem(rake-compiler) is available
+%if 0
 pushd ./%{geminstdir}
 sed -i.flags -e 's|-O3||' ext/nokogiri/extconf.rb
 find . -name \*.so -or -name \*.o -exec rm -f {} \;
-rake -v compile --trace
+rake -v ext/nokogiri/native.so --trace
+%endif
 
 %install
 rm -rf %{buildroot}
@@ -100,7 +98,7 @@ do
 done
 
 # cleanups
-rm -rf %{buildroot}%{geminstdir}/{ext,tmp}/
+rm -rf %{buildroot}%{geminstdir}/ext
 rm -f %{buildroot}%{geminstdir}/{.autotest,.require_paths}
 
 # The following method is completely copied from rubygem-gettext
@@ -169,12 +167,11 @@ create_symlink_rec %{geminstdir}/lib %{r
 rm -rf %{buildroot}
 
 %check
-# test_exslt(TestXsltTransforms) [./test/test_xslt_transforms.rb:93]
-# fails without TZ on sparc
-export TZ="Asia/Tokyo"
+# Skip until rubygem(rake-compiler) is available
+exit 0
 
 pushd ./%{geminstdir}
-rake test --trace
+rake test
 popd
 
 %files
@@ -202,28 +199,6 @@ popd
 %{ruby_sitelib}/xsd/
 
 %changelog
-* Tue Dec 15 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.4.1-1
-- 1.4.1
-
-* Mon Nov  9 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.4.0-1
-- 1.4.0
-
-* Sat Aug 22 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.3.3-2
-- Fix test failure on sparc
-
-* Wed Jul 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.3.3-1
-- 1.3.3
-
-* Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.3.2-3
-- F-12: Mass rebuild
-
-* Thu Jul  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.3.2-2
-- Enable test
-- Recompile with -O2
-
-* Thu Jun 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.3.2-1
-- 1.3.2
-
 * Thu Jun 11 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.3.1-1
 - 1.3.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-nokogiri/EL-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	15 Dec 2009 07:09:01 -0000	1.10
+++ sources	15 Mar 2010 15:07:20 -0000	1.11
@@ -1 +1 @@
-13405908a02c71daf1f302392ffa1507  nokogiri-1.4.1.gem
+ca963f336f34d0bc4ae2d881a5eaac49  nokogiri-1.3.1.gem