diff --git a/.gitignore b/.gitignore index 2c761f4..f18726d 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,5 @@ /rcairo-1.15.9-test-missing-files.tar.gz /cairo-1.15.10.gem /rcairo-1.15.10-test-missing-files.tar.gz +/cairo-1.15.11.gem +/rcairo-1.15.11-test-missing-files.tar.gz diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 201890b..1fe2f99 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -2,7 +2,7 @@ %global header_dir %{ruby_vendorarchdir} %global gem_name cairo -%global gemver 1.15.10 +%global gemver 1.15.11 #%%global gem_githash af3e3fc059 # Upstream GIT http://github.com/rcairo/ @@ -85,15 +85,19 @@ Header files and libraries for building a extension library for the ruby-cairo %prep -%setup -q -T -c +%setup -q -c -T -mkdir -p ./%{gem_dir} -export CONFIGURE_ARGS="--with-cflags='%{optflags}'" -%gem_install -n %{SOURCE0} +TOPDIR=$(pwd) +mkdir tmpunpackdir +pushd tmpunpackdir -find . -name \*.gem | xargs chmod 0644 +gem unpack %{SOURCE0} +cd %{gem_name}-%{version} + +#Patches, etc + +gem specification -l --ruby %{SOURCE0} > %{gem_name}.gemspec -%build # pkg-config dependency should be for development find . -name \*.gemspec | \ xargs sed -i \ @@ -101,6 +105,15 @@ find . -name \*.gemspec | \ -e '\@native-package-installer@s|runtime_dependency|development_dependency|' \ %{nil} +gem build %{gem_name}.gemspec +mv %{gem_name}-%{version}.gem $TOPDIR + +popd +rm -rf tmpunpackdir + +%build +%gem_install + # Once install to TMPINSTDIR for %%check rm -rf ./TMPINSTDIR mkdir -p ./TMPINSTDIR/%{gem_dir} @@ -172,14 +185,7 @@ cp -a rcairo/test/* test sed -i -e '\@require .rubygems@a\\ngem "test-unit"\n' test/run-test.rb sed -i -e "\@require 'bundler/setup'@d" test/run-test.rb -# Tracking: https://github.com/rcairo/rcairo/issues/50 -ruby ./test/run-test.rb || \ -%if 0%{?fedora} >= 27 - true -%else - false -%endif -popd +ruby ./test/run-test.rb %files %if 0%{?fedora} >= 21 @@ -213,6 +219,9 @@ popd %{header_dir}/rb_cairo.h %changelog +* Wed Dec 27 2017 Mamoru TASAKA - 1.15.11-1 +- 1.15.11 + * Sat Oct 21 2017 Mamoru TASAKA - 1.15.10-1 - 1.15.10 diff --git a/sources b/sources index b4a801e..fb9b856 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (cairo-1.15.10.gem) = af3cec5bf03022a5049922aaa0366b7330ec0e2003734ee855d1d9632d2027be6e08efd8b67c02bf3d006d11d8a7e28ac3d23ce9591940dc92442c7552858907 -SHA512 (rcairo-1.15.10-test-missing-files.tar.gz) = bae8b81843ff0a0e740f0522c1f88494637ea94298c36eb48e0b9345f46d58f0f4fbf232c7c133b4c0cdc32ffdf5f8a4a25c7c1f6157dab3be2e9a14908dbcb7 +SHA512 (cairo-1.15.11.gem) = 3c21468511eac323b27a86e1c5188b5444d3bf2de244f4dc35d0ae297cb3f1756ec8333555bb7c4178e9f4ebcfd1600e6fd77fa7fe76055bf633bb2f8c69271c +SHA512 (rcairo-1.15.11-test-missing-files.tar.gz) = 4a899926d84e4392c889647804ea9e79511544c29fa34137020fac97bd424b5346fbc280142b226f82f9421865b382a881da38ecf0acb45905dc9e230014fbb2