From 4cd38d35732ba9f6b9fd48913c853cb2eb9d2110 Mon Sep 17 00:00:00 2001
From: Ken Dreyer <ktdreyer@ktdreyer.com>
Date: Fri, 8 Jan 2016 10:56:22 -0700
Subject: Drop macros for Fedora 20 (now EOL)

- Switch to %autosetup macro
- Drop unneeded %license definition
---
 rubygem-rinku.spec | 29 +++++++++++------------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/rubygem-rinku.spec b/rubygem-rinku.spec
index 66b98d5..5d407c3 100644
--- a/rubygem-rinku.spec
+++ b/rubygem-rinku.spec
@@ -2,7 +2,7 @@
 
 Name: rubygem-%{gem_name}
 Version: 1.7.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Autolinking for Ruby
 Group: Development/Languages
 License: ISC
@@ -11,14 +11,14 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
 # Minitest 5 compat
 # https://github.com/vmg/rinku/pull/48
 Patch0: rinku-1.7.3-minitest.patch
-%if 0%{?fc20} || 0%{?el7}
+%if 0%{?el7}
 Requires: ruby
 Requires: ruby(rubygems)
 %endif
 BuildRequires: rubygems-devel
 BuildRequires: ruby-devel
 BuildRequires: rubygem(minitest)
-%if 0%{?fc20} || 0%{?el7}
+%if 0%{?el7}
 Provides: rubygem(%{gem_name}) = %{version}
 %endif
 
@@ -39,14 +39,10 @@ Documentation for %{name}.
 %prep
 gem unpack %{SOURCE0}
 
-%setup -q -D -T -n  %{gem_name}-%{version}
+%autosetup -p 1 -D -T -n  %{gem_name}-%{version}
 
 gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
 
-# Minitest 5 compat
-# https://github.com/vmg/rinku/pull/48
-%patch0 -p1
-
 # Remove unnecessary Rakefile
 rm Rakefile
 sed -i "s|\"Rakefile\",||g" %{gem_name}.gemspec
@@ -69,15 +65,8 @@ cp -a .%{gem_dir}/* \
 rm -r %{buildroot}%{gem_instdir}/ext
 
 # Move the binary extension
-%if 0%{?fc20}
-  install -d -m0755 %{buildroot}%{gem_extdir_mri}/lib
-  # move the extension to gem_extdir_mri
-  mv %{buildroot}%{gem_libdir}/rinku.so %{buildroot}%{gem_extdir_mri}/lib/
-%endif
-%if 0%{?fedora} > 20
-  mkdir -p %{buildroot}%{gem_extdir_mri}
-  cp -pa .%{gem_extdir_mri}/* %{buildroot}%{gem_extdir_mri}/
-%endif
+mkdir -p %{buildroot}%{gem_extdir_mri}
+cp -pa .%{gem_extdir_mri}/* %{buildroot}%{gem_extdir_mri}/
 
 %check
 pushd .%{gem_instdir}
@@ -85,7 +74,6 @@ pushd .%{gem_instdir}
 popd
 
 %files
-%{!?_licensedir:%global license %%doc}
 %dir %{gem_instdir}
 %license %{gem_instdir}/COPYING
 %doc %{gem_instdir}/README.markdown
@@ -99,6 +87,11 @@ popd
 %exclude %{gem_instdir}/test
 
 %changelog
+* Fri Jan 08 2016 Ken Dreyer <ktdreyer@ktdreyer.com> - 1.7.3-4
+- Drop macros for Fedora 20 (now EOL)
+- Switch to %%autosetup macro
+- Drop unneeded %%license definition
+
 * Sat Mar 28 2015 Ken Dreyer <ktdreyer@ktdreyer.com> - 1.7.3-3
 - Drop Fedora 19 conditionals
 - Remove extraneous BR: ruby. This is covered by BR: ruby-devel.
-- 
cgit