[rubygem-hpricot] Rebuilt for Ruby 1.9.3.
Vít Ondruch
vondruch at fedoraproject.org
Wed Feb 1 07:14:10 UTC 2012
commit f776cc207f4288191ae18f61667a09b16dbea490
Author: Vít Ondruch <vondruch at redhat.com>
Date: Wed Feb 1 08:14:04 2012 +0100
Rebuilt for Ruby 1.9.3.
rubygem-hpricot-0.8.3-segv-on-GC.patch | 19 ------
rubygem-hpricot.spec | 110 +++++++++++++++-----------------
2 files changed, 52 insertions(+), 77 deletions(-)
---
diff --git a/rubygem-hpricot.spec b/rubygem-hpricot.spec
index 4d21325..8ccda99 100644
--- a/rubygem-hpricot.spec
+++ b/rubygem-hpricot.spec
@@ -1,27 +1,23 @@
# Initially generated from hpricot-0.6.164.gem by gem2rpm -*- rpm-spec -*-
-%define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
-%define ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
-%define rubyabi 1.8
+%define rubyabi 1.9.1
-%define gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
-%define gemname hpricot
-%define geminstdir %{gemdir}/gems/%{gemname}-%{version}
+%define gem_name hpricot
Summary: A Fast, Enjoyable HTML Parser for Ruby
-Name: rubygem-%{gemname}
+Name: rubygem-%{gem_name}
Version: 0.8.5
-Release: 2%{?dist}
+Release: 3%{?dist}
Group: Development/Languages
# ext/fast_xs/FastXsService.java is licensed under ASL 2.0
License: MIT and ASL 2.0
URL: http://github.com/hpricot/hpricot
# Non-free file removed, see Source10
-# Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
-Source0: %{gemname}-%{version}-modified.gem
+# Source0: http://gems.rubyforge.org/gems/%{gem_name}-%{version}.gem
+Source0: %{gem_name}-%{version}-modified.gem
Source10: rubygem-hpricot-create-free-gem.sh
BuildRequires: ruby(abi) = %{rubyabi}
-BuildRequires: ruby(rubygems)
+BuildRequires: rubygems-devel
# Recompile
BuildRequires: rubygem(rake)
# Others
@@ -31,9 +27,11 @@ BuildRequires: rubygem(rdoc)
%endif
BuildRequires: ruby-devel
BuildRequires: ragel
+BuildRequires: rubygem(minitest)
+BuildRequires: rubygem(rake)
Requires: ruby(abi) = %{rubyabi}
Requires: ruby(rubygems)
-Provides: rubygem(%{gemname}) = %{version}-%{release}
+Provides: rubygem(%{gem_name}) = %{version}-%{release}
%description
Hpricot is a very flexible HTML parser, based on Tanaka Akira's
@@ -50,26 +48,26 @@ Requires: ruby(rubygems)
%description doc
This package contains documentation for %{name}.
-%package -n ruby-%{gemname}
-Summary: Non-Gem support package for %{gemname}
+%package -n ruby-%{gem_name}
+Summary: Non-Gem support package for %{gem_name}
Group: Development/Languages
Requires: %{name} = %{version}-%{release}
-Provides: ruby(%{gemname}) = %{version}-%{release}
+Provides: ruby(%{gem_name}) = %{version}-%{release}
-%description -n ruby-%{gemname}
-This package provides non-Gem support for %{gemname}.
+%description -n ruby-%{gem_name}
+This package provides non-Gem support for %{gem_name}.
%prep
%setup -q -T -c
-mkdir -p ./%{gemdir}
+mkdir -p ./%{gem_dir}
export CONFIGURE_ARGS="--with-cflags='%{optflags}'"
gem install \
--local \
- --install-dir ./%{gemdir} \
+ --install-dir ./%{gem_dir} \
-V --force \
%{SOURCE0}
-pushd .%{geminstdir}/test
+pushd .%{gem_instdir}/test
# Kill tests related to BOINGBOING, licensed under CC-BY-NC
grep -rl BOING . | \
xargs sed -i '/BOING/s|^\([ \t][ \t]*\)\(.*\)$|\1# This test is intentionally killed\n\1return true\n\1\2|'
@@ -81,30 +79,30 @@ find . -type f | xargs chmod ugo+r
%build
%install
-mkdir -p %{buildroot}%{gemdir}
-cp -a ./%{gemdir}/* %{buildroot}%{gemdir}
+mkdir -p %{buildroot}%{gem_dir}
+cp -a ./%{gem_dir}/* %{buildroot}%{gem_dir}
-mkdir -p %{buildroot}%{ruby_sitearch}
-mv %{buildroot}%{geminstdir}/lib/*.so %{buildroot}%{ruby_sitearch}
+mkdir -p %{buildroot}%{gem_extdir}/lib
+mv %{buildroot}%{gem_libdir}/*.so %{buildroot}%{gem_extdir}/lib
# Shebang
-for f in $(find %{buildroot}%{geminstdir} -name \*.rb)
+for f in $(find %{buildroot}%{gem_instdir} -name \*.rb)
do
sed -i -e '/^#!/d' $f
chmod 0644 $f
done
# clean
-rm -rf %{buildroot}%{geminstdir}/tmp/
+rm -rf %{buildroot}%{gem_instdir}/tmp/
# Kill unneeded files
-find %{buildroot}%{geminstdir}/ext \
+find %{buildroot}%{gem_instdir}/ext \
-type f \
-not -name \*.java \
-print0 | \
xargs -0 rm -f
-rm -f %{buildroot}%{geminstdir}/.require_paths
-DIR=%{buildroot}%{geminstdir}/lib/universal-java*
+rm -f %{buildroot}%{gem_instdir}/.require_paths
+DIR=%{buildroot}%{gem_libdir}/universal-java*
[ -d $DIR ] && rmdir $DIR
# The following method is completely copied from rubygem-gettext
@@ -112,10 +110,10 @@ DIR=%{buildroot}%{geminstdir}/lib/universal-java*
#
# Create symlinks
##
-## Note that before switching to gem %%{ruby_sitelib}/%%{gemname}
+## Note that before switching to gem %%{ruby_vendorlibdir}/%%{gem_name}
## already existed as a directory, so this cannot be replaced
## by symlink (cpio fails)
-## Similarly, all directories under %%{ruby_sitelib} cannot be
+## Similarly, all directories under %%{ruby_vendorlibdir} cannot be
## replaced by symlink
#
@@ -166,7 +164,7 @@ popd
}
-create_symlink_rec %{geminstdir}/lib %{ruby_sitelib}
+create_symlink_rec %{gem_libdir} %{ruby_vendorlibdir}
# Fix permission (bug 487654)
pushd %{buildroot}
@@ -175,44 +173,40 @@ find . -type f '(' -name '[A-Z]*' -or -name '*.java' -or -name '*.rb' -or -name
popd
%check
-export GEM_PATH=$(pwd)%{gemdir}
-pushd .%{geminstdir}
-
-# Kill bundler dependency
-# Kill rdoc dependency on F-15 and below
-sed -i.dep \
- -e '\@bundler/setup at d' \
-%if 0%{?fedora} < 16
- -e '\@require at s|rdoc/task|rake/rdoctask|' \
-%endif
- Rakefile
+export GEM_PATH=$(pwd)%{gem_dir}:%{gem_dir}
+pushd .%{gem_instdir}
-rake test
+# problem reported here: https://github.com/hpricot/hpricot/issues/52
+LANG=en_US.utf8
+testrb -Ilib test
popd
%files
%defattr(-,root, root,-)
-%{ruby_sitearch}/*.so
-%dir %{geminstdir}/
-%doc %{geminstdir}/[A-Z]*
-%exclude %{geminstdir}/Rakefile
-%{geminstdir}/[a-l]*/
-%{gemdir}/cache/%{gemname}-%{version}.gem
-%{gemdir}/specifications/%{gemname}-%{version}.gemspec
+%{gem_extdir}
+%dir %{gem_instdir}/
+%doc %{gem_instdir}/[A-Z]*
+%exclude %{gem_instdir}/Rakefile
+%{gem_instdir}/[a-l]*/
+%{gem_cache}
+%{gem_spec}
%files doc
%defattr(-,root,root,-)
-%{geminstdir}/Rakefile
-%{geminstdir}/extras/
-%{geminstdir}/test/
-%{gemdir}/doc/%{gemname}-%{version}/
+%{gem_instdir}/Rakefile
+%{gem_instdir}/extras/
+%{gem_instdir}/test/
+%{gem_docdir}/
-%files -n ruby-%{gemname}
+%files -n ruby-%{gem_name}
%defattr(-,root,root,-)
-%{ruby_sitelib}/%{gemname}.rb
-%{ruby_sitelib}/%{gemname}/
+%{ruby_vendorlibdir}/%{gem_name}.rb
+%{ruby_vendorlibdir}/%{gem_name}/
%changelog
+* Tue Jan 31 2012 Bohuslav Kabrda <bkabrda at redhat.com> - 0.8.5-3
+- Rebuilt for Ruby 1.9.3.
+
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
More information about the scm-commits
mailing list