From 5c5cea879b7b8cfeff868004899368bb062928e0 Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka@fedoraproject.org>
Date: Thu, 11 Mar 2021 23:23:47 +0900
Subject: [PATCH] 1.17.5

---
 .gitignore         |  2 ++
 rubygem-cairo.spec | 42 +++++++-----------------------------------
 sources            |  4 ++--
 3 files changed, 11 insertions(+), 37 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2b3550c..1298f05 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,5 @@
 /rcairo-1.16.5-test-missing-files.tar.gz
 /rcairo-1.16.6-test-missing-files.tar.gz
 /cairo-1.16.6.gem
+/cairo-1.17.5.gem
+/rcairo-1.17.5-test-missing-files.tar.gz
diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec
index 51dc40f..8703df2 100644
--- a/rubygem-cairo.spec
+++ b/rubygem-cairo.spec
@@ -2,10 +2,10 @@
 %global	header_dir	%{ruby_vendorarchdir}
 
 %global	gem_name		cairo
-%global	gemver		1.16.6
+%global	gemver		1.17.5
 #%%global	gem_githash	af3e3fc059
 
-%global	need_test_bootstrap	1
+%global	need_test_bootstrap	0
 
 # Upstream GIT http://github.com/rcairo/
 
@@ -14,7 +14,7 @@
 Summary:	Ruby bindings for cairo
 Name:		rubygem-%{gem_name}
 Version:	%{gemver}
-Release:	3%{?dist}
+Release:	1%{?dist}
 License:	GPLv2 or Ruby
 URL:		http://cairographics.org/rcairo/
 %if 1
@@ -29,21 +29,15 @@ Source11:	rcairo-%{version}-test-missing-files.tar.gz
 # Source11 is generated by the below
 Source12:	rcairo-create-missing-test-files.sh
 
-%if 0%{?fedora} >= 19
 Requires:	ruby(release)
 BuildRequires:	ruby(release)
-%else
-Requires:	ruby(abi) = %{rubyabi}
-Requires:	ruby 
-BuildRequires:	ruby(abi) = %{rubyabi}
-BuildRequires:	ruby 
-%endif
 
 BuildRequires:	gcc
 
 BuildRequires:	rubygems-devel
 BuildRequires:	cairo-devel
 BuildRequires:	ruby-devel
+BuildRequires:	rubygem(red-colors)
 # For %%check
 BuildRequires:	rubygem(test-unit)
 BuildRequires:	rubygem(test-unit-notify)
@@ -136,7 +130,6 @@ do
 done
 
 # Move C extension
-%if 0%{?fedora} >= 21
 mkdir -p ./TMPINSTDIR/%{gem_extdir_mri}
 cp -a ./%{gem_extdir_mri}/*  TMPINSTDIR/%{gem_extdir_mri}/
 
@@ -147,20 +140,6 @@ rm -f .%{gem_extdir_mri}/{gem_make.out,mkmf.log}
 
 popd
 
-%else
-pushd ./TMPINSTDIR
-mkdir -p .%{gem_extdir_mri}/lib
-mv .%{gem_instdir}/lib/%{gem_name}.so \
-	./%{gem_extdir_mri}/lib
-
-# Move header
-mkdir -p ./%{header_dir}
-mv ./%{gem_instdir}/lib/*.h \
-	./%{header_dir}/
-popd
-%endif
-
-
 # cleanups
 rm -rf ./TMPINSTDIR/%{gem_instdir}/ext/
 rm -f ./TMPINSTDIR/%{gem_instdir}/{Makefile*,extconf.rb}
@@ -195,24 +174,14 @@ sed -i -e "\@require 'bundler/setup'@d" test/run-test.rb
 ruby ./test/run-test.rb
 
 %files
-%if 0%{?fedora} >= 21
 %{gem_extdir_mri}/
-%else
-%dir %{gem_extdir_mri}
-%dir %{gem_extdir_mri}/lib
-%{gem_extdir_mri}/lib/%{gem_name}.so
-%endif
 
 %dir	%{gem_instdir}/
 %doc	%{gem_instdir}/[A-Z]*
 %exclude %{gem_instdir}/Gemfile
 %exclude %{gem_instdir}/Rakefile
 %{gem_instdir}/lib/
-%if 0%{?fedora} >= 20
 %exclude	%{gem_cache}
-%else
-%{gem_cache}
-%endif
 %{gem_spec}
 
 %files	doc
@@ -226,6 +195,9 @@ ruby ./test/run-test.rb
 %{header_dir}/rb_cairo.h
 
 %changelog
+* Thu Mar 11 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.17.5-1
+- 1.17.5
+
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.16.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
diff --git a/sources b/sources
index 93f3325..eb0f566 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (rcairo-1.16.6-test-missing-files.tar.gz) = e42f5a5ca7ce314dd766756a468237d25ba77a233ef62cba429d6a1c3f1dc4e5b9f34cb807b95357449e2ce2d0cebb1b00a0444a6a0ed0d6270e2fcad206b7d3
-SHA512 (cairo-1.16.6.gem) = f499daa83e865d58cc29d158ce649cab9f939464a08e5d7711f6cf255fb8dcfbf52457e3d2b81aef2018ad8d0762117776049b3681c9be6abdf4f0b12e43404c
+SHA512 (cairo-1.17.5.gem) = f2ade6fb6b9fccd81a11061b277d4a9077936e0beef42c61225bd4d5630586a57a3fa192a20a0f7e4922313e2a8215268bc9a5d007d2805cf1f80714fd9ad1ba
+SHA512 (rcairo-1.17.5-test-missing-files.tar.gz) = ad70a1470f01e6a4e7fbd1ed1ec1b60caaeadf1af1a0adaf2be5ad48f9ce474f023fe60d18110c1a80a7fbe24287edcbda913200f0baae335a0299efbdcf5497