rpms/rubygem-nokogiri/devel .cvsignore, 1.5, 1.6 rubygem-nokogiri.spec, 1.6, 1.7 sources, 1.5, 1.6
Mamoru Tasaka
mtasaka at fedoraproject.org
Wed Jun 10 19:54:09 UTC 2009
- Previous message: rpms/rubygem-nokogiri/F-11 .cvsignore, 1.5, 1.6 rubygem-nokogiri.spec, 1.6, 1.7 sources, 1.5, 1.6
- Next message: rpms/graphviz/F-11 graphviz-2.20.3-sparc64-is-64bit.patch, NONE, 1.1 graphviz.spec, 1.55, 1.56
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mtasaka
Update of /cvs/extras/rpms/rubygem-nokogiri/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17721/rubygem-nokogiri/devel
Modified Files:
.cvsignore rubygem-nokogiri.spec sources
Log Message:
nokogiri 1.3.1, mechanize 0.9.3
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rubygem-nokogiri/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore 25 Mar 2009 19:45:03 -0000 1.5
+++ .cvsignore 10 Jun 2009 19:53:39 -0000 1.6
@@ -1 +1 @@
-nokogiri-1.2.3.gem
+nokogiri-1.3.1.gem
Index: rubygem-nokogiri.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-nokogiri/devel/rubygem-nokogiri.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- rubygem-nokogiri.spec 25 Mar 2009 19:45:03 -0000 1.6
+++ rubygem-nokogiri.spec 10 Jun 2009 19:53:39 -0000 1.7
@@ -8,7 +8,7 @@
Summary: An HTML, XML, SAX, and Reader parser
Name: rubygem-%{gemname}
-Version: 1.2.3
+Version: 1.3.1
Release: 1%{?dist}
Group: Development/Languages
License: MIT
@@ -20,6 +20,8 @@ BuildRequires: ruby(abi) = %{rubyabi}
BuildRequires: ruby(rubygems)
BuildRequires: rubygem(hoe)
BuildRequires: rubygem(rake)
+# Not available yet
+# BuildRequires(check): rubygem(rake-compiler)
BuildRequires: libxml2-devel
BuildRequires: libxslt-devel
BuildRequires: ruby-devel
@@ -66,18 +68,13 @@ gem install \
%{SOURCE0}
# 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
-# F-10/9 hoe is old and readme_file or so are not defined
-%if 0%{?fedora} < 11
-sed -i.readme \
- -e '/p\.readme_file/d' \
- -e '/p\.history_file/d' \
- -e '/p\.extra_rdoc_files/d' \
- Rakefile
-%endif
find . -name \*.so -or -name \*.o -exec rm -f {} \;
rake -v ext/nokogiri/native.so --trace
+%endif
%install
rm -rf %{buildroot}
@@ -89,6 +86,10 @@ mkdir -p %{buildroot}%{ruby_sitearch}/%{
mv %{buildroot}%{geminstdir}/lib/%{gemname}/*.so \
%{buildroot}%{ruby_sitearch}/%{gemname}/
+# move bin/ files
+mkdir -p %{buildroot}%{_prefix}
+mv -f %{buildroot}%{gemdir}/bin %{buildroot}%{_prefix}
+
# remove all shebang
for f in $(find %{buildroot}%{geminstdir} -name \*.rb)
do
@@ -98,11 +99,7 @@ done
# cleanups
rm -rf %{buildroot}%{geminstdir}/ext
-rm -f %{buildroot}%{geminstdir}/{.autotest,.require_paths,Rakefile}
-
-# vendor/hoe.rb is no longer installed
-: rm -f %{buildroot}/%{geminstdir}/vendor/hoe.rb
-: rmdir %{buildroot}/%{geminstdir}/vendor/
+rm -f %{buildroot}%{geminstdir}/{.autotest,.require_paths}
# The following method is completely copied from rubygem-gettext
# spec file
@@ -170,21 +167,27 @@ create_symlink_rec %{geminstdir}/lib %{r
rm -rf %{buildroot}
%check
+# Skip until rubygem(rake-compiler) is available
+exit 0
+
pushd ./%{geminstdir}
-rake test || :
+rake test
popd
%files
%defattr(-,root, root,-)
+%{_bindir}/%{gemname}
%{ruby_sitearch}/%{gemname}/
%dir %{geminstdir}/
%doc %{geminstdir}/[A-Z]*
+%exclude %{geminstdir}/Rakefile
%{geminstdir}/[a-l]*/
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec
%files doc
%defattr(-,root,root,-)
+%{geminstdir}/Rakefile
%{geminstdir}/tasks/
%{geminstdir}/test/
%{gemdir}/doc/%{gemname}-%{version}/
@@ -196,6 +199,9 @@ popd
%{ruby_sitelib}/xsd/
%changelog
+* Thu Jun 11 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.3.1-1
+- 1.3.1
+
* Thu Mar 26 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.3-1
- 1.2.3
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rubygem-nokogiri/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources 25 Mar 2009 19:45:03 -0000 1.5
+++ sources 10 Jun 2009 19:53:39 -0000 1.6
@@ -1 +1 @@
-4654239b8deb597a905a722a1854911c nokogiri-1.2.3.gem
+ca963f336f34d0bc4ae2d881a5eaac49 nokogiri-1.3.1.gem
- Previous message: rpms/rubygem-nokogiri/F-11 .cvsignore, 1.5, 1.6 rubygem-nokogiri.spec, 1.6, 1.7 sources, 1.5, 1.6
- Next message: rpms/graphviz/F-11 graphviz-2.20.3-sparc64-is-64bit.patch, NONE, 1.1 graphviz.spec, 1.55, 1.56
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list