#1 Bump to alpha 16 release
Merged 5 years ago by snecker. Opened 5 years ago by snecker.
Unknown source master  into  master

file modified
+1 -3
@@ -1,3 +1,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

@@ -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<asciidoctor>, [">= 1.5.0"])

-        s.add_runtime_dependency(%q<prawn>, ["< 3.0.0", ">= 1.3.0"])

-        s.add_runtime_dependency(%q<prawn-table>, ["= 0.2.2"])

- -      s.add_runtime_dependency(%q<prawn-templates>, ["= 0.0.3"])

- +      s.add_runtime_dependency(%q<prawn-templates>, ["< 0.0.5", ">= 0.0.3"])

-        s.add_runtime_dependency(%q<prawn-svg>, ["< 0.26.0", ">= 0.21.0"])

- -      s.add_runtime_dependency(%q<prawn-icon>, ["= 1.2.0"])

- +      s.add_runtime_dependency(%q<prawn-icon>, ["< 2.0.0", ">= 1.0.0"])

-        s.add_runtime_dependency(%q<safe_yaml>, ["~> 1.0.4"])

-        s.add_runtime_dependency(%q<thread_safe>, ["~> 0.3.5"])

- -      s.add_runtime_dependency(%q<treetop>, ["= 1.5.3"])

- +      s.add_runtime_dependency(%q<treetop>, ["< 2.0.0", ">= 1.5.3"])

-      else

-        s.add_dependency(%q<rake>, [">= 0"])

-        s.add_dependency(%q<asciidoctor>, [">= 1.5.0"])

-        s.add_dependency(%q<prawn>, ["< 3.0.0", ">= 1.3.0"])

-        s.add_dependency(%q<prawn-table>, ["= 0.2.2"])

- -      s.add_dependency(%q<prawn-templates>, ["= 0.0.3"])

- +      s.add_dependency(%q<prawn-templates>, ["< 0.0.5", ">= 0.0.3"])

-        s.add_dependency(%q<prawn-svg>, ["< 0.26.0", ">= 0.21.0"])

- -      s.add_dependency(%q<prawn-icon>, ["= 1.2.0"])

- +      s.add_dependency(%q<prawn-icon>, ["< 2.0.0", ">= 1.0.0"])

-        s.add_dependency(%q<safe_yaml>, ["~> 1.0.4"])

-        s.add_dependency(%q<thread_safe>, ["~> 0.3.5"])

- -      s.add_dependency(%q<treetop>, ["= 1.5.3"])

- +      s.add_dependency(%q<treetop>, ["< 2.0.0", ">= 1.5.3"])

-      end

-    else

-      s.add_dependency(%q<rake>, [">= 0"])

-      s.add_dependency(%q<asciidoctor>, [">= 1.5.0"])

-      s.add_dependency(%q<prawn>, ["< 3.0.0", ">= 1.3.0"])

-      s.add_dependency(%q<prawn-table>, ["= 0.2.2"])

- -    s.add_dependency(%q<prawn-templates>, ["= 0.0.3"])

- +    s.add_dependency(%q<prawn-templates>, ["< 0.0.5", ">= 0.0.3"])

-      s.add_dependency(%q<prawn-svg>, ["< 0.26.0", ">= 0.21.0"])

- -    s.add_dependency(%q<prawn-icon>, ["= 1.2.0"])

- +    s.add_dependency(%q<prawn-icon>, ["< 2.0.0", ">= 1.0.0"])

-      s.add_dependency(%q<safe_yaml>, ["~> 1.0.4"])

-      s.add_dependency(%q<thread_safe>, ["~> 0.3.5"])

- -    s.add_dependency(%q<treetop>, ["= 1.5.3"])

- +    s.add_dependency(%q<treetop>, ["< 2.0.0", ">= 1.5.3"])

-    end

-  end

-  

file modified
+8 -8
@@ -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 @@

  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 @@

  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 @@

  %{gem_instdir}/Rakefile

  

  %changelog

+ * Wed Nov 07 2018 Christopher Brown <chris.brown@redhat.com> - 1.5.0-0.6.alpha.16

+ - Update to 1.5.0.alpha.16

+ 

  * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-0.6.alpha.13

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

  

file modified
+1 -1
@@ -1,1 +1,1 @@

- 11828c55875ad8cfabf7134717a5eb6b  asciidoctor-pdf-1.5.0.alpha.13.gem

+ SHA512 (asciidoctor-pdf-1.5.0.alpha.16.gem) = 09918a61808d27d2bf2c8924669a6e91aa07e1929e101f338c7251e3e548210a82269b26972ffa60926229cd211b94ce548795eac9f554851c1f2f0729c64a21

We will need to bring this up to latest version to handle new prawn builds
Also remove additional patch and use macro in specfile

rebased onto 292775c

5 years ago

@snecker any reason to not to add an upper limit (< 2.0.0) ?

@snecker I left a comment on the spec file, other than that LGTM.

Thanks, I've added an upper constraint.

rebased onto 39a9736

5 years ago

Pull-Request has been merged by snecker

5 years ago