Project

General

Profile

« Previous | Next » 

Revision 911f0a68

Added by Dominic Cleal over 8 years ago

Update nokogiri to 1.6.6.2

View differences:

comps/comps-foreman-fedora19.xml
<packagereq type="default">rubygem-mysql2</packagereq>
<packagereq type="default">rubygem-net-ldap</packagereq>
<packagereq type="default">rubygem-net-scp</packagereq>
<packagereq type="default">rubygem-nokogiri</packagereq>
<packagereq type="default">rubygem-po_to_json</packagereq>
<packagereq type="default">rubygem-powerbar</packagereq>
<packagereq type="default">rubygem-quiet_assets</packagereq>
......
<packagereq type="default">rubygem-mysql2-doc</packagereq>
<packagereq type="default">rubygem-net-ldap-doc</packagereq>
<packagereq type="default">rubygem-net-scp-doc</packagereq>
<packagereq type="default">rubygem-nokogiri-doc</packagereq>
<packagereq type="default">rubygem-po_to_json-doc</packagereq>
<packagereq type="default">rubygem-powerbar-doc</packagereq>
<packagereq type="default">rubygem-quiet_assets-doc</packagereq>
rel-eng/tito.props
rubygem-mysql2
rubygem-net-ldap
rubygem-net-scp
rubygem-nokogiri
rubygem-po_to_json
rubygem-powerbar
rubygem-quiet_assets
rubygem-nokogiri/nokogiri-1.5.11.gem
../.git/annex/objects/kz/V0/SHA256E-s222208--578a5bcd184851893fc9818f79a9ff9b19568481b136d5e70178fd0f3b2f6ac8.11.gem/SHA256E-s222208--578a5bcd184851893fc9818f79a9ff9b19568481b136d5e70178fd0f3b2f6ac8.11.gem
rubygem-nokogiri/nokogiri-1.6.6.2.gem
../.git/annex/objects/jq/z8/SHA256E-s9249280--60c060c694a62145b9224413efa346de5a893582c1fbc0326bc74089c5d898c8.2.gem/SHA256E-s9249280--60c060c694a62145b9224413efa346de5a893582c1fbc0326bc74089c5d898c8.2.gem
rubygem-nokogiri/rubygem-nokogiri.spec
%{?scl:%scl_package rubygem-%{gemname}}
%{!?scl:%global pkg_name %{name}}
%global mainver 1.5.11
%global mainver 1.6.6.2
#%%global prever .beta.4
%global mainrel 1
......
%global rubyabi 1.9.1
%global gemdir %{gem_dir}
%global geminstdir %{gem_instdir}
%if 0%{?fedora}
%global gemsodir %{gem_extdir_mri}/lib
%else
%global gemsodir %{gem_extdir}/lib
%endif
%global gem_name %{gemname}
# Note for packager:
......
Group: Development/Languages
License: MIT
URL: http://nokogiri.rubyforge.org/nokogiri/
Source0: http://gems.rubyforge.org/gems/%{gemname}-%{mainver}%{?prever}.gem
Source0: http://rubygems.org/gems/%{gemname}-%{mainver}.gem
# ./test/html/test_element_description.rb:62 fails, as usual......
# Patch0: rubygem-nokogiri-1.5.0.beta3-test-failure.patch
#Patch0: rubygem-nokogiri-1.5.0-allow-non-crosscompile.patch
%if 0%{?fedora} >= 19
Requires: %{?scl_prefix_ruby}ruby(release)
BuildRequires: %{?scl_prefix_ruby}ruby(release)
%else
Requires: %{?scl_prefix_ruby}ruby(abi) = %{rubyabi}
BuildRequires: %{?scl_prefix_ruby}ruby(abi) = %{rubyabi}
%endif
BuildRequires: %{?scl_prefix_ruby}ruby(rubygems)
##
## For %%check
......
BuildRequires: libxml2-devel
BuildRequires: libxslt-devel
BuildRequires: %{?scl_prefix_ruby}ruby-devel
Requires: %{?scl_prefix_ruby}ruby(abi) = %{rubyabi}
Requires: %{?scl_prefix_ruby}ruby(rubygems)
Provides: %{?scl_prefix}rubygem(%{gemname}) = %{version}-%{release}
%{?scl:Obsoletes: ruby193-rubygem-%{gemname}}
......
%setup -n %{pkg_name}-%{version} -q -T -c
# Gem repack
TOPDIR=$(pwd)
mkdir tmpunpackdir
pushd tmpunpackdir
......
gem specification -l --ruby %{SOURCE0} > %{gem_name}.gemspec
%{?scl:"}
popd
# remove bundled external libraries
sed -i \
-e 's|, "ports/archives/[^"][^"]*"||g' \
-e 's|, "ports/patches/[^"][^"]*"||g' \
%{gem_name}.gemspec
# Actually not needed when using system libraries
sed -i -e '\@mini_portile@d' %{gem_name}.gemspec
%build
TOPDIR=$(pwd)
pushd tmpunpackdir/%{gem_name}-%{version}
# Ummm...
%{?scl:scl enable %{scl} "}
env LANG=ja_JP.UTF-8 gem build %{gem_name}.gemspec
......
popd
rm -rf tmpunpackdir
%build
mkdir -p ./%{gemdir}
export CONFIGURE_ARGS="--with-cflags='%{optflags}'"
# 1.6.0 needs this
export NOKOGIRI_USE_SYSTEM_LIBRARIES=yes
%{?scl:scl enable %{scl} "}
gem install \
--local \
......
# cleanups
rm -rf %{buildroot}%{geminstdir}/ext/%{gemname}/
rm -rf %{buildroot}%{geminstdir}/tmp/
rm -f %{buildroot}%{geminstdir}/{.autotest,.require_paths,.gemtest}
rm -f %{buildroot}%{geminstdir}/{build_all,test_all}
%if 0%{?ruby19} < 1
# The following method is completely copied from rubygem-gettext
# spec file
#
# Create symlinks
##
## Note that before switching to gem %%{ruby_sitelib}/%%{gemname}
## already existed as a directory, so this cannot be replaced
## by symlink (cpio fails)
## Similarly, all directories under %%{ruby_sitelib} cannot be
## replaced by symlink
#
create_symlink_rec(){
ORIGBASEDIR=$1
TARGETBASEDIR=$2
## First calculate relative path of ORIGBASEDIR
## from TARGETBASEDIR
TMPDIR=$TARGETBASEDIR
BACKDIR=
DOWNDIR=
num=0
nnum=0
while true
do
num=$((num+1))
TMPDIR=$(echo $TMPDIR | sed -e 's|/[^/][^/]*$||')
DOWNDIR=$(echo $ORIGBASEDIR | sed -e "s|^$TMPDIR||")
if [ x$DOWNDIR != x$ORIGBASEDIR ]
then
nnum=0
while [ $nnum -lt $num ]
do
BACKDIR="../$BACKDIR"
nnum=$((nnum+1))
done
break
fi
done
RELBASEDIR=$( echo $BACKDIR/$DOWNDIR | sed -e 's|//*|/|g' )
## Next actually create symlink
pushd %{buildroot}/$ORIGBASEDIR
find . -type f | while read f
do
DIRNAME=$(dirname $f)
BACK2DIR=$(echo $DIRNAME | sed -e 's|/[^/][^/]*|/..|g')
mkdir -p %{buildroot}${TARGETBASEDIR}/$DIRNAME
LNNAME=$(echo $BACK2DIR/$RELBASEDIR/$f | \
sed -e 's|^\./||' | sed -e 's|//|/|g' | \
sed -e 's|/\./|/|' )
ln -s -f $LNNAME %{buildroot}${TARGETBASEDIR}/$f
done
popd
}
create_symlink_rec %{geminstdir}/lib %{ruby_sitelib}
%endif
rm -f %{buildroot}%{geminstdir}/{.autotest,.require_paths,.gemtest,.travis.yml}
rm -f %{buildroot}%{geminstdir}/.cross_rubies
rm -f %{buildroot}%{geminstdir}/{build_all,dependencies.yml,test_all}
rm -f %{buildroot}%{geminstdir}/.editorconfig
rm -rf %{buildroot}%{geminstdir}/suppressions/
%check
# Ah....
......
%endif
pushd ./%{geminstdir}
# Some files are missing and due to it some tests fail, skip
SKIPTEST="test/xml/test_xinclude.rb"
for f in $SKIPTEST
do
mv $f $f.skip
done
# Observed fail on test_subclass_parse(Nokogiri::XML::TestDocument)
# Need investigation. For now anyway build
%{?scl:scl enable %{scl} "}
%{?scl:scl enable %{scl} - << \EOF}
ruby -I.:lib:test \
%if ! 0%{?ruby19} < 1
%{?scl:"}
-rubygems \
%endif
-e \
"require 'minitest/autorun' ; Dir.glob('test/**/test_*.rb'){|f| require f}" || \
echo "Please investigate this"
%{?scl:EOF}
for f in $SKIPTEST
do
......
%if 0%{?ruby19} < 1
%{ruby_sitearch}/%{gemname}
%else
%{gem_extdir}/
%{gemsodir}/
%endif
%dir %{geminstdir}/
%doc %{geminstdir}/[A-Z]*
#%%doc %{geminstdir}/nokogiri_help_responses.md
%exclude %{geminstdir}/Rakefile
%exclude %{geminstdir}/Gemfile
%{geminstdir}/bin/
%{geminstdir}/lib/
%{gemdir}/cache/%{gemname}-%{mainver}%{?prever}.gem

Also available in: Unified diff