diff --git a/.gitignore b/.gitignore index 974c1f3..3e6c166 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,5 @@ /rubygem-rabbit-2.2.0-test-missing-files.tar.gz /rabbit-2.2.1.gem /rubygem-rabbit-2.2.1-test-missing-files.tar.gz +/rabbit-3.0.0.gem +/rubygem-rabbit-3.0.0-test-missing-files.tar.gz diff --git a/rubygem-rabbit.spec b/rubygem-rabbit.spec index a197177..d92facd 100644 --- a/rubygem-rabbit.spec +++ b/rubygem-rabbit.spec @@ -5,8 +5,8 @@ BuildRequires: %1 \ %{nil} Name: rubygem-%{gem_name} -Version: 2.2.1 -Release: 6%{?dist} +Version: 3.0.0 +Release: 1%{?dist} Summary: RD-document-based presentation application # CC-BY: rubykaigi2011-background-white.jpg and @@ -22,6 +22,8 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem Source1: %{name}-%{version}-test-missing-files.tar.gz Source10: rabbit.desktop Source11: rabbit.xml +# Rescue kramdown 1 +Patch1: rubygem-rabbit-3.0.0-rescue-kramdown1.patch %BothRequires ruby(release) BuildRequires: rubygems-devel @@ -30,10 +32,11 @@ Requires: ruby(rubygems) %BothRequires rubygem(coderay) %BothRequires rubygem(faraday) %BothRequires rubygem(gettext) -%BothRequires rubygem(gtk2) -%BothRequires rubygem(gio2) +%BothRequires rubygem(gdk_pixbuf2) +%BothRequires rubygem(gtk3) %BothRequires rubygem(hikidoc) %BothRequires rubygem(kramdown) +Requires: (( rubygem-kramdown < 1.18 ) or ( ( rubygem-kramdown >= 2.0 ) and rubygem-kramdown-parser-gfm )) %BothRequires rubygem(nokogiri) %BothRequires rubygem(poppler) %BothRequires rubygem(rouge) @@ -71,6 +74,10 @@ gem unpack %{SOURCE0} %setup -q -D -T -n %{gem_name}-%{version} gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec +# For now, relax kramdown series dependency +sed -i %{gem_name}.gemspec -e 's|kramdown-parser-gfm|kramdown|' + +%patch1 -p1 %build gem build %{gem_name}.gemspec @@ -158,6 +165,10 @@ popd %doc %{gem_instdir}/sample/ %changelog +* Mon Sep 9 2019 Mamoru TASAKA - 3.0.0-1 +- 3.0.0 +- Relax kramdown dependency, handle both kramdown 1.17 and 2 case + * Fri Jul 26 2019 Fedora Release Engineering - 2.2.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 04fa0f7..4af665c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rabbit-2.2.1.gem) = c30f8fc09366e8676c8502854c9186459b1609110ab4f80ebac3e3b272f805410e69718c2d217f4cd29f10518d3a925de7c7dcda44d4a7f999db2ec48e0c3173 -SHA512 (rubygem-rabbit-2.2.1-test-missing-files.tar.gz) = d6a8ad5ac277dd43af69e2fbd2ad4545a9a0fb09cb97954770b1b94d0602deedf00333f23ecf33924114fd9de5c8b4cd792484a7661dad9fe73a33c260d1aa9d +SHA512 (rabbit-3.0.0.gem) = c3a1c25807057028017a48de389d2d4260bd75b2d13ec90b9f399388e0ed51bc40c72045a33146d0c9f3cbc60248116760361255c4ad7b693ed60d5ac61cdcf7 +SHA512 (rubygem-rabbit-3.0.0-test-missing-files.tar.gz) = 8d0ba5eac1fcb3b6307299feec0b055eec88414294bc653962d4c9b9d17ab9051eb466dbf27272fdf4b9ecf5512b185023d1c2fe314ddb174798add3d50c5809