diff --git a/.gitignore b/.gitignore index 9de2406..134bcfa 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,5 @@ nokogiri-1.4.3.1.gem /nokogiri-1.8.3.gem /nokogiri-1.8.4.gem /nokogiri-1.8.5.gem +/nokogiri-1.9.1.gem +/rubygem-nokogiri-1.9.1-full.tar.gz diff --git a/nokogiri-create-full-tarball.sh b/nokogiri-create-full-tarball.sh new file mode 100644 index 0000000..d6fbd01 --- /dev/null +++ b/nokogiri-create-full-tarball.sh @@ -0,0 +1,27 @@ +#!/bin/bash + +if [ $# -lt 2 ] +then + echo "$0 " + exit 1 +fi + +set -x +set -e + +CURRDIR=$(pwd) + +TMPDIRPATH=$(mktemp -d /var/tmp/$1-tar-XXXXXX) +pushd $TMPDIRPATH + +git clone https://github.com/sparklemotion/$1.git +pushd $1 +git reset --hard v$2 +popd + +ln -sf $1 $1-$2 +tar czf ${CURRDIR}/rubygem-$1-$2-full.tar.gz $1-$2/./ + +popd + +rm -rf $TMPDIRPATH diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 8c447b9..fe2e6d1 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,4 +1,4 @@ -%global mainver 1.8.5 +%global mainver 1.9.1 #%%global prever .rc3 %global mainrel 1 @@ -12,11 +12,14 @@ Summary: An HTML, XML, SAX, and Reader parser Name: rubygem-%{gem_name} Version: %{mainver} -Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist}.1 +Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist} Group: Development/Languages License: MIT URL: http://nokogiri.rubyforge.org/nokogiri/ Source0: https://rubygems.org/gems/%{gem_name}-%{mainver}%{?prever}.gem +# %%{SOURCE2} %%{name} %%{version} +Source1: rubygem-%{gem_name}-%{version}-full.tar.gz +Source2: nokogiri-create-full-tarball.sh # ./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 @@ -76,7 +79,7 @@ This package provides non-Gem support for %{gem_name}. %global version %{mainver}%{?prever} %prep -%setup -q -T -c +%setup -q -T -c -a 1 # Gem repack TOPDIR=$(pwd) @@ -151,6 +154,9 @@ do chmod 0644 $f done +# Copy document files from full source +cp -p %{gem_name}-%{version}/[A-Z]* %{buildroot}%{gem_instdir}/ + # cleanups rm -rf %{buildroot}%{gem_instdir}/ext/%{gem_name}/ rm -rf %{buildroot}%{gem_instdir}/tmp/ @@ -174,6 +180,8 @@ export TZ="Asia/Tokyo" #??? LANG=C.UTF-8 +# Copy test files from full tarball +cp -a %{gem_name}-%{version}/test/ ./%{gem_instdir} pushd ./%{gem_instdir} # Need investigation. For now anyway build @@ -214,11 +222,14 @@ popd %defattr(-,root,root,-) #%%{gem_instdir}/deps.rip #%%{gem_instdir}/spec/ -%{gem_instdir}/tasks/ -%{gem_instdir}/test/ +%exclude %{gem_instdir}/tasks/ +%exclude %{gem_instdir}/test/ %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Mon Dec 31 2018 Mamoru TASAKA - 1.9.1-1 +- 1.9.1 + * Sun Nov 18 2018 Zbigniew Jędrzejewski-Szmek - 1.8.5-1.1 - Use C.UTF-8 locale See https://fedoraproject.org/wiki/Changes/Remove_glibc-langpacks-all_from_buildroot diff --git a/sources b/sources index adea18c..0a3f5e0 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (nokogiri-1.8.5.gem) = 4f74bc70a778a7b0655b47d25c437c496941c44b0c83cdcd4f721453b17d35a3a145831b250a8d8077f6a78a0659d5f2f685f472f0b29a8f078bcbd3ab3ba817 +SHA512 (nokogiri-1.9.1.gem) = e287ded4dfdd2ed99d6acd63781a4a64c51d70ded6b97ad653888660201d6575a1eea96aedac9be31570531412b1a404e03229d2e31fd0c8ed2824d8ebb46bc3 +SHA512 (rubygem-nokogiri-1.9.1-full.tar.gz) = bb06498c05c1d2bddd3736696bc29336383129a97fbc19bfa5e3523c397c984062dff6f45eae473a6a7d28b4a59ac097fb3cbddc041d959b565d9bc7209f1f89