From eae0d56af7e83aff8150f108a3b0a4a8069f2287 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Tue, 5 Jan 2016 12:23:58 -0600 Subject: [PATCH 1/2] Updated build process for EPEL-7 --- rubygem-redcarpet.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/rubygem-redcarpet.spec b/rubygem-redcarpet.spec index 0b34c08..ad1a24a 100644 --- a/rubygem-redcarpet.spec +++ b/rubygem-redcarpet.spec @@ -2,7 +2,7 @@ Name: rubygem-%{gem_name} Version: 3.3.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A fast, safe and extensible Markdown to (X)HTML parser Group: Development/Languages # https://github.com/vmg/redcarpet/issues/502 @@ -45,7 +45,11 @@ cp -a ./%{_bindir}/* %{buildroot}%{_bindir} chmod 755 %{buildroot}%{_bindir}/redcarpet mkdir -p %{buildroot}%{gem_extdir_mri} +%if 0%{?rhel} > 6 +mv %{buildroot}%{gem_instdir}/lib/*.so %{buildroot}%{gem_extdir_mri} +%else cp -a .%{gem_extdir_mri}/{gem.build_complete,*.so} %{buildroot}%{gem_extdir_mri}/ +%endif # Prevent dangling symlink in -debuginfo. rm -rf %{buildroot}%{gem_instdir}/ext @@ -75,6 +79,9 @@ popd %changelog +* Tue Jan 05 2016 Greg Hellings - 3.3.2-1 - Update to Redcarpet 3.3.2. From 828605661d1c376a4096dd89450921c570ab0baa Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Wed, 6 Jan 2016 12:06:25 -0600 Subject: [PATCH 2/2] Add explicit Provides --- rubygem-redcarpet.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/rubygem-redcarpet.spec b/rubygem-redcarpet.spec index ad1a24a..3341d74 100644 --- a/rubygem-redcarpet.spec +++ b/rubygem-redcarpet.spec @@ -2,7 +2,7 @@ Name: rubygem-%{gem_name} Version: 3.3.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A fast, safe and extensible Markdown to (X)HTML parser Group: Development/Languages # https://github.com/vmg/redcarpet/issues/502 @@ -13,6 +13,9 @@ BuildRequires: ruby(release) BuildRequires: rubygems-devel BuildRequires: ruby-devel BuildRequires: rubygem(test-unit) +%if 0%{?rhel} == 7 +Provides: rubygem(%{gem_name}) = %{version} +%endif %description A fast, safe and extensible Markdown to (X)HTML parser. @@ -79,7 +82,10 @@ popd %changelog -* Tue Jan 05 2016 Greg Hellings - 3.2.2-3 +- Add explicit support for EPEL7 + +* Tue Jan 05 2016 Greg Hellings - 3.2.2-2 - Add support for EPEL7 * Wed Jul 08 2015 Vít Ondruch - 3.3.2-1