[rubygem-hpricot/f15] 0.8.6

Wed Apr 11 05:39:17 UTC 2012

commit 7d17be72e59877d778bdf478c027ef5d01d48a9c
Author: Mamoru TASAKA <mtasaka at localhost.localdomain>
Date:   Wed Apr 11 14:39:08 2012 +0900

    0.8.6

 .gitignore                         |    1 +
 rubygem-hpricot-create-free-gem.sh |    5 +-
 rubygem-hpricot.spec               |  134 +++++++++++++++++++++--------------
 sources                            |    2 +-
 4 files changed, 86 insertions(+), 56 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index fd3a8ae..86fd619 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ hpricot-0.8.2-modified.gem
 /hpricot-0.8.3-modified.gem
 /hpricot-0.8.4-modified.gem
 /hpricot-0.8.5-modified.gem
+/hpricot-0.8.6-modified.gem
diff --git a/rubygem-hpricot-create-free-gem.sh b/rubygem-hpricot-create-free-gem.sh
index a4fea77..a0abd08 100644
--- a/rubygem-hpricot-create-free-gem.sh
+++ b/rubygem-hpricot-create-free-gem.sh
@@ -19,8 +19,11 @@ cd TMP
 
 # Remove CC-BY-NC licensed file
 find . -name \*boingboing\* | xargs rm -f
+# Ah.. fixing Rakefile
+find . -name Rakefile | \
+	xargs sed -i -e '\@s\.version at s|VERS$|VERS.dup|'
 # Recreate gem
-VERSION=${VERSION} rake gem
+VERSION=${VERSION} rake gem --trace
 
 popd
 mv ${TMPDIR}/TMP/pkg/*.gem hpricot-${VERSION}-modified.gem
diff --git a/rubygem-hpricot.spec b/rubygem-hpricot.spec
index 050017c..c7893bd 100644
--- a/rubygem-hpricot.spec
+++ b/rubygem-hpricot.spec
@@ -1,27 +1,29 @@
 # 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']")
+%if 0%{?fedora} >= 17
+%define	rubyabi		1.9.1
+%else
 %define	rubyabi		1.8
+%define        ruby_sitelib            %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
+%define        ruby_sitearch           %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
+%endif
 
-%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}
-Version:	0.8.5
+Name:		rubygem-%{gem_name}
+Version:	0.8.6
 Release:	1%{?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 +33,15 @@ 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}
+%if 0%{?fedora} >= 17
+Obsoletes:	ruby-%{gem_name} <= %{version}-%{release}
+Provides:	ruby-%{gem_name} = %{version}-%{release}
+%endif
 
 %description
 Hpricot is a very flexible HTML parser, based on Tanaka Akira's 
@@ -50,26 +58,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 +89,35 @@ 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}
 
+%if 0%{?fedora} >= 17
+mkdir -p %{buildroot}%{gem_extdir}/lib
+mv %{buildroot}%{gem_libdir}/*.so %{buildroot}%{gem_extdir}/lib
+%else
 mkdir -p %{buildroot}%{ruby_sitearch}
-mv %{buildroot}%{geminstdir}/lib/*.so %{buildroot}%{ruby_sitearch}
+mv %{buildroot}%{gem_libdir}/*.so %{buildroot}%{ruby_sitearch}/
+%endif
 
 # 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,7 +125,7 @@ DIR=%{buildroot}%{geminstdir}/lib/universal-java*
 #
 # Create symlinks
 ##
-## Note that before switching to gem %%{ruby_sitelib}/%%{gemname}
+## Note that before switching to gem %%{ruby_sitelib}/%%{gem_name}
 ## already existed as a directory, so this cannot be replaced
 ## by symlink (cpio fails)
 ## Similarly, all directories under %%{ruby_sitelib} cannot be
@@ -166,7 +179,9 @@ popd
 
 }
 
-create_symlink_rec %{geminstdir}/lib %{ruby_sitelib}
+%if 0%{?fedora} < 17
+create_symlink_rec %{gem_libdir} %{ruby_sitelib}
+%endif
 
 # Fix permission (bug 487654)
 pushd %{buildroot}
@@ -175,44 +190,55 @@ 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,-)
+%if 0%{?fedora} >= 17
+%{gem_extdir}
+%else
 %{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
+%endif
+%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}
+%if 0%{?fedora} < 17
+%files	-n ruby-%{gem_name}
 %defattr(-,root,root,-)
-%{ruby_sitelib}/%{gemname}.rb
-%{ruby_sitelib}/%{gemname}/
+%{ruby_sitelib}/%{gem_name}.rb
+%{ruby_sitelib}/%{gem_name}/
+%endif
 
 %changelog
+* Wed Apr 11 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 0.8.6-1
+- 0.8.6
+
+* Sun Feb  5 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 0.8.5-4
+- F-17: kill compat ruby-%%{gem_name} package
+
+* 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
+
 * Mon Dec  5 2011 Mamoru Tasaka <mtasaka at fedoraproject.org> - 0.8.5-1
 - 0.8.5
 
diff --git a/sources b/sources
index e7697d8..d3ac068 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7e20eb6f38f5dcffdcbb1acae156ea7d  hpricot-0.8.5-modified.gem
+5d737234720f3847cc5def6c0047f2e4  hpricot-0.8.6-modified.gem
