From 5fcbfd87424fa26581b47a8b849e521ad7f1f331 Mon Sep 17 00:00:00 2001 From: Vít Ondruch Date: Jun 25 2019 11:27:17 +0000 Subject: [PATCH 1/3] Remove unnecessary autogenerated Provides/Requires. --- diff --git a/rubygem-asciidoctor-pdf.spec b/rubygem-asciidoctor-pdf.spec index adac385..31c9757 100644 --- a/rubygem-asciidoctor-pdf.spec +++ b/rubygem-asciidoctor-pdf.spec @@ -16,12 +16,9 @@ Summary: Converts AsciiDoc documents to PDF using Prawn License: MIT URL: https://github.com/asciidoctor/asciidoctor-pdf Source0: http://rubygems.org/gems/%{gem_name}-%{version}%{?prever}.gem -Provides: %{gem_name} = %{version}-%{release} BuildRequires: ruby(release) BuildRequires: rubygems-devel > 1.3.1 BuildRequires: ruby >= 1.9 -Requires: ruby(release) -Requires: ruby(rubygems) BuildArch: noarch From baae8f66127a5547ea752cbcee5bb4093867d05e Mon Sep 17 00:00:00 2001 From: Vít Ondruch Date: Jun 25 2019 11:28:09 +0000 Subject: [PATCH 2/3] Use %prerelease macro supported by rubygems macros. --- diff --git a/rubygem-asciidoctor-pdf.spec b/rubygem-asciidoctor-pdf.spec index 31c9757..6d5e1c4 100644 --- a/rubygem-asciidoctor-pdf.spec +++ b/rubygem-asciidoctor-pdf.spec @@ -1,21 +1,15 @@ %global gem_name asciidoctor-pdf %global mainver 1.5.0 -%global prever .alpha.16 +%global prerelease .alpha.16 %global release 9 -%{?prever: -%global gem_instdir %{gem_dir}/gems/%{gem_name}-%{mainver}%{?prever} -%global gem_docdir %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever} -%global gem_cache %{gem_dir}/cache/%{gem_name}-%{mainver}%{?prever}.gem -%global gem_spec %{gem_dir}/specifications/%{gem_name}-%{mainver}%{?prever}.gemspec -} Name: rubygem-%{gem_name} Version: %{mainver} -Release: %{?prever:0.}%{release}%{?prever}%{?dist} +Release: %{?prerelease:0.}%{release}%{?prerelease}%{?dist} Summary: Converts AsciiDoc documents to PDF using Prawn License: MIT URL: https://github.com/asciidoctor/asciidoctor-pdf -Source0: http://rubygems.org/gems/%{gem_name}-%{version}%{?prever}.gem +Source0: http://rubygems.org/gems/%{gem_name}-%{version}%{?prerelease}.gem BuildRequires: ruby(release) BuildRequires: rubygems-devel > 1.3.1 BuildRequires: ruby >= 1.9 @@ -35,17 +29,17 @@ BuildArch: noarch Documentation for %{name}. %prep -%setup -q -n %{gem_name}-%{version}%{?prever} -%gemspec_remove_dep -s ../%{gem_name}-%{version}%{?prever}.gemspec -g treetop "= 1.5.3" -%gemspec_remove_dep -s ../%{gem_name}-%{version}%{?prever}.gemspec -g prawn-icon "= 1.3.0" -%gemspec_remove_dep -s ../%{gem_name}-%{version}%{?prever}.gemspec -g prawn-svg ">= 0.21.0", "< 0.28.0" -%gemspec_add_dep -s ../%{gem_name}-%{version}%{?prever}.gemspec -g treetop "< 2.0.0" -%gemspec_add_dep -s ../%{gem_name}-%{version}%{?prever}.gemspec -g prawn-svg "~> 0.28.0" -%gemspec_add_dep -s ../%{gem_name}-%{version}%{?prever}.gemspec -g prawn-icon "~> 2.3.0" +%setup -q -n %{gem_name}-%{version}%{?prerelease} +%gemspec_remove_dep -s ../%{gem_name}-%{version}%{?prerelease}.gemspec -g treetop "= 1.5.3" +%gemspec_remove_dep -s ../%{gem_name}-%{version}%{?prerelease}.gemspec -g prawn-icon "= 1.3.0" +%gemspec_remove_dep -s ../%{gem_name}-%{version}%{?prerelease}.gemspec -g prawn-svg ">= 0.21.0", "< 0.28.0" +%gemspec_add_dep -s ../%{gem_name}-%{version}%{?prerelease}.gemspec -g treetop "< 2.0.0" +%gemspec_add_dep -s ../%{gem_name}-%{version}%{?prerelease}.gemspec -g prawn-svg "~> 0.28.0" +%gemspec_add_dep -s ../%{gem_name}-%{version}%{?prerelease}.gemspec -g prawn-icon "~> 2.3.0" %build -gem build ../%{gem_name}-%{version}%{?prever}.gemspec -%gem_install -n%{gem_name}-%{version}%{?prever}.gem +gem build ../%{gem_name}-%{version}%{?prerelease}.gemspec +%gem_install %install mkdir -p %{buildroot}%{gem_dir} From b5eaa4270fb3636fdf66d75e849b46addef2a95d Mon Sep 17 00:00:00 2001 From: Vít Ondruch Date: Jun 25 2019 12:41:05 +0000 Subject: [PATCH 3/3] Use %prerelease macro supported by latest version of %gemspec_ macros. --- diff --git a/rubygem-asciidoctor-pdf.spec b/rubygem-asciidoctor-pdf.spec index 6d5e1c4..0f22f73 100644 --- a/rubygem-asciidoctor-pdf.spec +++ b/rubygem-asciidoctor-pdf.spec @@ -30,12 +30,12 @@ Documentation for %{name}. %prep %setup -q -n %{gem_name}-%{version}%{?prerelease} -%gemspec_remove_dep -s ../%{gem_name}-%{version}%{?prerelease}.gemspec -g treetop "= 1.5.3" -%gemspec_remove_dep -s ../%{gem_name}-%{version}%{?prerelease}.gemspec -g prawn-icon "= 1.3.0" -%gemspec_remove_dep -s ../%{gem_name}-%{version}%{?prerelease}.gemspec -g prawn-svg ">= 0.21.0", "< 0.28.0" -%gemspec_add_dep -s ../%{gem_name}-%{version}%{?prerelease}.gemspec -g treetop "< 2.0.0" -%gemspec_add_dep -s ../%{gem_name}-%{version}%{?prerelease}.gemspec -g prawn-svg "~> 0.28.0" -%gemspec_add_dep -s ../%{gem_name}-%{version}%{?prerelease}.gemspec -g prawn-icon "~> 2.3.0" +%gemspec_remove_dep -g treetop "= 1.5.3" +%gemspec_remove_dep -g prawn-icon "= 1.3.0" +%gemspec_remove_dep -g prawn-svg ">= 0.21.0", "< 0.28.0" +%gemspec_add_dep -g treetop "< 2.0.0" +%gemspec_add_dep -g prawn-svg "~> 0.28.0" +%gemspec_add_dep -g prawn-icon "~> 2.3.0" %build gem build ../%{gem_name}-%{version}%{?prerelease}.gemspec