[rubygem-unicode] updated to upstream release 0.4.4.1; fixed spec for rubygem changes in F21+

Dan Callaghan dcallagh at fedoraproject.org
Tue Dec 23 01:17:04 UTC 2014


commit ce7f9cad4488c83243090f3a884a4e225d4fc645
Author: Dan Callaghan <djc at djc.id.au>
Date:   Thu Jun 5 10:51:42 2014 +1000

    updated to upstream release 0.4.4.1; fixed spec for rubygem changes in F21+

 .gitignore           |    1 +
 rubygem-unicode.spec |   23 ++++++++++++++++++-----
 sources              |    2 +-
 3 files changed, 20 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f51b852..bcda0b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 unicode-0.4.4.gem
+/unicode-0.4.4.1.gem
diff --git a/rubygem-unicode.spec b/rubygem-unicode.spec
index 2f53b1d..78c6707 100644
--- a/rubygem-unicode.spec
+++ b/rubygem-unicode.spec
@@ -1,19 +1,23 @@
 %global gem_name unicode
 
 Name:           rubygem-%{gem_name}
-Version:        0.4.4
+Version:        0.4.4.1
 Release:        1%{?dist}
 Summary:        Unicode normalization library for Ruby
 License:        Ruby
 URL:            http://www.yoshidam.net/Ruby.html#unicode
 Source0:        https://rubygems.org/gems/%{gem_name}-%{version}.gem
 Source1:        http://www.ruby-lang.org/en/about/license.txt
+# This is a C extension linked against MRI, it's not compatible with other 
+# interpreters. So we require MRI specifically instead of ruby(release).
 Requires:       ruby
-Requires:       ruby(rubygems)
-BuildRequires:  ruby
-BuildRequires:  rubygems-devel
 BuildRequires:  ruby-devel
+BuildRequires:  rubygems-devel
+# rubygem Requires/Provides are automatically generated in F21+
+%if ! (0%{?fedora} >= 21 || 0%{?rhel} >= 8)
+Requires:       rubygems
 Provides:       rubygem(%{gem_name}) = %{version}
+%endif
 
 %description
 Unicode normalization library for Ruby.
@@ -30,11 +34,16 @@ gem build %{gem_name}.gemspec
 
 %install
 mkdir -p %{buildroot}%{gem_dir}
-cp -pa .%{gem_dir}/specifications/ %{buildroot}%{gem_dir}
+cp -pa .%{gem_dir}/specifications %{buildroot}%{gem_dir}/
 mkdir -p %{buildroot}%{gem_instdir}
 cp -pa .%{gem_instdir}/lib %{buildroot}%{gem_instdir}/
+%if 0%{?fedora} >= 21 || 0%{?rhel} >= 8
+mkdir -p %{buildroot}%{gem_extdir_mri}
+cp -pa .%{gem_extdir_mri}/%{gem_name} %{buildroot}%{gem_extdir_mri}/
+%else
 mkdir -p %{buildroot}%{gem_extdir_mri}/lib
 mv %{buildroot}%{gem_instdir}/lib/unicode %{buildroot}%{gem_extdir_mri}/lib/
+%endif
 
 %files
 %doc README license.txt
@@ -43,5 +52,9 @@ mv %{buildroot}%{gem_instdir}/lib/unicode %{buildroot}%{gem_extdir_mri}/lib/
 %{gem_spec}
 
 %changelog
+* Thu Jun 05 2014 Dan Callaghan <dcallagh at redhat.com> - 0.4.4.1-1
+- updated to upstream release 0.4.4.1
+- fixed spec for rubygem changes in F21+
+
 * Tue Jan 28 2014 Dan Callaghan <dcallagh at redhat.com> - 0.4.4-1
 - Initial package
diff --git a/sources b/sources
index 3a9e547..2719a8d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f5df3e2c08db50cdae6fc7df8b52fc3b  unicode-0.4.4.gem
+eada9d317988ba2dc502474304a37ca6  unicode-0.4.4.1.gem


More information about the scm-commits mailing list