From 39a97367950b2c9d66d1fe425f3759d7be7e199c Mon Sep 17 00:00:00 2001 From: Christopher Brown Date: Nov 07 2018 10:51:50 +0000 Subject: Bump to alpha 16 release add upper constraint to treetop dep --- diff --git a/.gitignore b/.gitignore index b65a3a5..16aa826 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1 @@ -/asciidoctor-pdf-1.5.0.alpha.11.gem -/asciidoctor-pdf-1.5.0.alpha.12.gem -/asciidoctor-pdf-1.5.0.alpha.13.gem +/asciidoctor-pdf-*.gem diff --git a/asciidoctor-pdf-fix-dependencies.patch b/asciidoctor-pdf-fix-dependencies.patch deleted file mode 100644 index 539c8f2..0000000 --- a/asciidoctor-pdf-fix-dependencies.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- asciidoctor-pdf.gemspec.orig 2016-09-27 19:28:53.495785416 +0100 -+++ asciidoctor-pdf.gemspec 2016-09-28 10:13:09.407501178 +0100 -@@ -29,35 +29,35 @@ - s.add_runtime_dependency(%q, [">= 1.5.0"]) - s.add_runtime_dependency(%q, ["< 3.0.0", ">= 1.3.0"]) - s.add_runtime_dependency(%q, ["= 0.2.2"]) -- s.add_runtime_dependency(%q, ["= 0.0.3"]) -+ s.add_runtime_dependency(%q, ["< 0.0.5", ">= 0.0.3"]) - s.add_runtime_dependency(%q, ["< 0.26.0", ">= 0.21.0"]) -- s.add_runtime_dependency(%q, ["= 1.2.0"]) -+ s.add_runtime_dependency(%q, ["< 2.0.0", ">= 1.0.0"]) - s.add_runtime_dependency(%q, ["~> 1.0.4"]) - s.add_runtime_dependency(%q, ["~> 0.3.5"]) -- s.add_runtime_dependency(%q, ["= 1.5.3"]) -+ s.add_runtime_dependency(%q, ["< 2.0.0", ">= 1.5.3"]) - else - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 1.5.0"]) - s.add_dependency(%q, ["< 3.0.0", ">= 1.3.0"]) - s.add_dependency(%q, ["= 0.2.2"]) -- s.add_dependency(%q, ["= 0.0.3"]) -+ s.add_dependency(%q, ["< 0.0.5", ">= 0.0.3"]) - s.add_dependency(%q, ["< 0.26.0", ">= 0.21.0"]) -- s.add_dependency(%q, ["= 1.2.0"]) -+ s.add_dependency(%q, ["< 2.0.0", ">= 1.0.0"]) - s.add_dependency(%q, ["~> 1.0.4"]) - s.add_dependency(%q, ["~> 0.3.5"]) -- s.add_dependency(%q, ["= 1.5.3"]) -+ s.add_dependency(%q, ["< 2.0.0", ">= 1.5.3"]) - end - else - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 1.5.0"]) - s.add_dependency(%q, ["< 3.0.0", ">= 1.3.0"]) - s.add_dependency(%q, ["= 0.2.2"]) -- s.add_dependency(%q, ["= 0.0.3"]) -+ s.add_dependency(%q, ["< 0.0.5", ">= 0.0.3"]) - s.add_dependency(%q, ["< 0.26.0", ">= 0.21.0"]) -- s.add_dependency(%q, ["= 1.2.0"]) -+ s.add_dependency(%q, ["< 2.0.0", ">= 1.0.0"]) - s.add_dependency(%q, ["~> 1.0.4"]) - s.add_dependency(%q, ["~> 0.3.5"]) -- s.add_dependency(%q, ["= 1.5.3"]) -+ s.add_dependency(%q, ["< 2.0.0", ">= 1.5.3"]) - end - end - diff --git a/rubygem-asciidoctor-pdf.spec b/rubygem-asciidoctor-pdf.spec index 85bd502..f38b89b 100644 --- a/rubygem-asciidoctor-pdf.spec +++ b/rubygem-asciidoctor-pdf.spec @@ -1,6 +1,6 @@ %global gem_name asciidoctor-pdf %global mainver 1.5.0 -%global prever .alpha.13 +%global prever .alpha.16 %global release 6 %{?prever: %global gem_instdir %{gem_dir}/gems/%{gem_name}-%{mainver}%{?prever} @@ -17,8 +17,6 @@ Group: Development/Languages License: MIT URL: https://github.com/asciidoctor/asciidoctor-pdf Source0: http://rubygems.org/gems/%{gem_name}-%{version}%{?prever}.gem -# Workaround to very strict dependencies -Patch0: asciidoctor-pdf-fix-dependencies.patch Provides: %{gem_name} = %{version}-%{release} BuildRequires: ruby(release) BuildRequires: rubygems-devel > 1.3.1 @@ -42,13 +40,12 @@ BuildArch: noarch Documentation for %{name}. %prep -gem unpack %{SOURCE0} -%setup -q -D -T -n %{gem_name}-%{version}%{?prever} -gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec -%patch0 +%setup -q -n %{gem_name}-%{version}%{?prever} +%gemspec_remove_dep -s ../%{gem_name}-%{version}%{?prever}.gemspec -g treetop "= 1.5.3" +%gemspec_add_dep -s ../%{gem_name}-%{version}%{?prever}.gemspec -g treetop "< 2.0.0" %build -gem build %{gem_name}.gemspec +gem build ../%{gem_name}-%{version}%{?prever}.gemspec %gem_install -n%{gem_name}-%{version}%{?prever}.gem %install @@ -82,6 +79,9 @@ find %{buildroot}%{gem_instdir}/bin -type f | xargs chmod a+x %{gem_instdir}/Rakefile %changelog +* Wed Nov 07 2018 Christopher Brown - 1.5.0-0.6.alpha.16 +- Update to 1.5.0.alpha.16 + * Sat Jul 14 2018 Fedora Release Engineering - 1.5.0-0.6.alpha.13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 2999c00..6569a77 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -11828c55875ad8cfabf7134717a5eb6b asciidoctor-pdf-1.5.0.alpha.13.gem +SHA512 (asciidoctor-pdf-1.5.0.alpha.16.gem) = 09918a61808d27d2bf2c8924669a6e91aa07e1929e101f338c7251e3e548210a82269b26972ffa60926229cd211b94ce548795eac9f554851c1f2f0729c64a21