diff --git a/.gitignore b/.gitignore index 89dc797..3e6c166 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,16 @@ -/rabbit-*.gem -/rubygem-rabbit-*-test-missing-files.tar.gz +/rabbit-2.1.1.gem +/rubygem-rabbit-2.1.1-test-missing-files.tar.gz +/rabbit-2.1.2.gem +/rubygem-rabbit-2.1.2-test-missing-files.tar.gz +/rabbit-2.1.3.gem +/rabbit-2.1.4.gem +/rabbit-2.1.5.gem +/rabbit-2.1.6.gem +/rabbit-2.1.8.gem +/rabbit-2.1.9.gem +/rabbit-2.2.0.gem +/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/rabbit-create-missing-test-files.sh b/rabbit-create-missing-test-files.sh deleted file mode 100644 index 061182d..0000000 --- a/rabbit-create-missing-test-files.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - -usage() { - echo "$0 " -} - -set -e -set -x - -GEMNAME=rabbit - -if [ $# -lt 1 ] ; then - usage - exit 1 -fi - -VERSION=$1 - -TMPDIR=$(mktemp -d /var/tmp/${GEMNAME}-XXXXXX) -CURDIR=$(pwd) - -pushd $TMPDIR - -git clone https://github.com/rabbit-shocker/${GEMNAME}.git -cd ${GEMNAME} - -git reset --hard $VERSION -cd .. -ln -sf ${GEMNAME} ${GEMNAME}-${VERSION} - -tar czf $CURDIR/rubygem-${GEMNAME}-${VERSION}-test-missing-files.tar.gz ${GEMNAME}-${VERSION}/./test/ - -popd -rm -rf $TMPDIR - diff --git a/rubygem-rabbit-3.0.0-rescue-kramdown1.patch b/rubygem-rabbit-3.0.0-rescue-kramdown1.patch new file mode 100644 index 0000000..c93c630 --- /dev/null +++ b/rubygem-rabbit-3.0.0-rescue-kramdown1.patch @@ -0,0 +1,15 @@ +diff -urp 3.0.0.dep/lib/rabbit/parser/markdown.rb 3.0.0/lib/rabbit/parser/markdown.rb +--- 3.0.0.dep/lib/rabbit/parser/markdown.rb 2019-09-06 06:24:48.000000000 +0900 ++++ 3.0.0/lib/rabbit/parser/markdown.rb 2019-09-09 14:50:10.995800735 +0900 +@@ -1,5 +1,10 @@ + require "kramdown" +-require "kramdown-parser-gfm" ++begin ++ require "kramdown-parser-gfm" ++rescue LoadError ++ require "kramdown/parser/kramdown" ++ require "kramdown/parser/gfm" ++end + + require "rabbit/parser/base" + diff --git a/rubygem-rabbit.spec b/rubygem-rabbit.spec index 8cddeb0..d92facd 100644 --- a/rubygem-rabbit.spec +++ b/rubygem-rabbit.spec @@ -5,67 +5,51 @@ BuildRequires: %1 \ %{nil} Name: rubygem-%{gem_name} -Version: 4.0.1 +Version: 3.0.0 Release: 1%{?dist} Summary: RD-document-based presentation application -# GPL-2.0-or-later: overall -# The following is obtained from: -# https://www.w3.org/TR/MathML2/chapter6.html#chars.entity.tables , so from -# https://www.w3.org/TR/MathML2/overview.html , so: -# W3C: entities/ -# HPND: lib/rabbit/trackball.rb -# From doc/en/index.rd: -# CC-BY-3.0: data/rabbit/image/rubykaigi2011-images/rubykaigi2011-background-white.jpg -# CC-BY-3.0: data/rabbit/image/rubykaigi2011-images/rubykaigi2011-background-black.jpg -# SPDX confirmed -License: GPL-2.0-or-later AND W3C AND HPND AND CC-BY-3.0 +# CC-BY: rubykaigi2011-background-white.jpg and +# rubykaigi2011-background-black.jpg +# (see doc/en/index.rd) +License: GPLv2+ and CC-BY URL: http://rabbit-shocker.org/ Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem +# git clone https://github.com/rabbit-shocker/rabbit.git +# cd rabbit/ +# git reset --hard %%{version} +# tar czf rubygem-rabbit-%%{version}-test-missing-files.tar.gz test/fixtures/ Source1: %{name}-%{version}-test-missing-files.tar.gz -# Source1 is created by $ bash %%SOURCE2 %%version -Source2: rabbit-create-missing-test-files.sh Source10: rabbit.desktop Source11: rabbit.xml +# Rescue kramdown 1 +Patch1: rubygem-rabbit-3.0.0-rescue-kramdown1.patch %BothRequires ruby(release) BuildRequires: rubygems-devel Requires: ruby(rubygems) %BothRequires rubygem(coderay) -%BothRequires rubygem(csv) -%BothRequires rubygem(drb) -# Dependency removed on 3.0.2 -#%%BothRequires rubygem(faraday) +%BothRequires rubygem(faraday) %BothRequires rubygem(gettext) %BothRequires rubygem(gdk_pixbuf2) %BothRequires rubygem(gtk3) %BothRequires rubygem(hikidoc) %BothRequires rubygem(kramdown) -Requires: rubygem-kramdown >= 2.0 -%BothRequires rubygem(kramdown-parser-gfm) +Requires: (( rubygem-kramdown < 1.18 ) or ( ( rubygem-kramdown >= 2.0 ) and rubygem-kramdown-parser-gfm )) %BothRequires rubygem(nokogiri) %BothRequires rubygem(poppler) -%BothRequires rubygem(ostruct) %BothRequires rubygem(rouge) %BothRequires rubygem(rsvg2) %BothRequires rubygem(rdtool) %BothRequires rubygem(rttool) -%BothRequires rubygem(rexml) # test_codeblock_fence test needs below -# FIXME -# On F-39, python3-blockdiag is FTI because of looooong dependency chain breakage -# after python3.12 transition, -# chain beginning with python3-pycodestyle, skip this test -%if 0%{?fedora} < 39 BuildRequires: %{_bindir}/blockdiag -%endif BuildRequires: desktop-file-utils # For rabbirc Requires: rubygem(net-irc) Requires: rubygem(gdk_pixbuf2) >= 3.0.9 -BuildRequires: rubygem(racc) BuildRequires: rubygem(test-unit) BuildRequires: rubygem(test-unit-notify) BuildRequires: rubygem(test-unit-rr) @@ -86,20 +70,19 @@ BuildArch: noarch Documentation for %{name} %prep -%autosetup -n %{gem_name}-%{version} -a 1 -p 1 -mv ../%{gem_name}-%{version}.gemspec . +gem unpack %{SOURCE0} +%setup -q -D -T -n %{gem_name}-%{version} -# Remove gtk4 dependency -sed -i %{gem_name}-%{version}.gemspec \ - -e '\@add_runtime_dependency.*gtk4@d' +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}-%{version}.gemspec +gem build %{gem_name}.gemspec %gem_install -cp -a %{gem_name}-%{version}/test/ ./%{gem_instdir}/ - %install mkdir -p %{buildroot}%{gem_dir} cp -pa .%{gem_dir}/* \ @@ -127,12 +110,9 @@ install -cpm 644 .%{gem_instdir}/sample/rabbit_icon.png \ # Cleanup pushd %{buildroot}%{gem_instdir} rm -rf \ - Gemfile \ - Rakefile \ - %{gem_name}.gemspec \ + Gemfile Rakefile %{gem_name}.gemspec \ po/ \ - test/ \ - %{nil} + test/ popd %find_lang rabbit @@ -143,13 +123,10 @@ do done %check -LANG=C.utf8 +# test files are not included in binary rpm, so just +# unpack here pushd .%{gem_instdir} - -# F-39: skip blockdiag related test -sed -i.skip test/parser/test-markdown.rb \ - -e 's|\(def test_codeblock_fence\)|\1 ; omit|' - +gzip -dc %{SOURCE1} | tar -xf - xvfb-run \ ruby test/run-test.rb popd @@ -188,80 +165,6 @@ popd %doc %{gem_instdir}/sample/ %changelog -* Thu Aug 21 2025 Mamoru TASAKA - 4.0.1-1 -- 4.0.1 - -* Fri Jul 25 2025 Fedora Release Engineering - 3.0.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Tue Apr 01 2025 Mamoru TASAKA - 3.0.5-1 -- 3.0.5 - -* Mon Mar 24 2025 Mamoru TASAKA - 3.0.4-1 -- 3.0.4 - -* Sat Jan 18 2025 Fedora Release Engineering - 3.0.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Jul 19 2024 Fedora Release Engineering - 3.0.3-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Fri Jan 26 2024 Fedora Release Engineering - 3.0.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jul 21 2023 Fedora Release Engineering - 3.0.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Wed Jul 5 2023 Mamoru TASAKA - 3.0.3-2 -- Skip blockdiag integration test, python3-blockdiag now FTI - because of loooong dependency chain breakage with python3.12 - -* Sun Jul 2 2023 Mamoru TASAKA - 3.0.3-1 -- 3.0.3 - -* Sat Jul 1 2023 Mamoru TASAKA - 3.0.2-2 -- SPDX migration - -* Sat Jul 1 2023 Mamoru TASAKA - 3.0.2-1 -- 3.0.2 - -* Fri Jan 20 2023 Fedora Release Engineering - 3.0.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 3.0.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jan 21 2022 Fedora Release Engineering - 3.0.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Tue Sep 28 2021 Mamoru TASAKA - 3.0.1-1 -- 3.0.1 - -* Fri Jul 23 2021 Fedora Release Engineering - 3.0.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Fri Mar 12 2021 Mamoru TASAKA - 3.0.0-7 -- F-34: add rubygem(rexml) dep - -* Mon Feb 1 2021 Mamoru TASAKA - 3.0.0-6 -- Remove old kramdown depedency stuff -- Add upstream URI.open patch to suppress warnings - -* Wed Jan 27 2021 Fedora Release Engineering - 3.0.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 3.0.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jan 31 2020 Mamoru TASAKA - 3.0.0-3 -- BR: rubygem(racc) for test - -* Thu Jan 30 2020 Fedora Release Engineering - 3.0.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Sep 13 2019 Mamoru TASAKA - 3.0.0-2 -- Stop to use RPM rich dependency - does not seem to do as I expect - * Mon Sep 9 2019 Mamoru TASAKA - 3.0.0-1 - 3.0.0 - Relax kramdown dependency, handle both kramdown 1.17 and 2 case diff --git a/sources b/sources index e5067e6..4af665c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rabbit-4.0.1.gem) = db17048007f938ff201b5598dc8680c04fb9aeb3f1f02955515457093fa07c38e22450fe6c4f2ca34a527e17060f6a623a7adefd2fef3f65c3a67d3665be1d35 -SHA512 (rubygem-rabbit-4.0.1-test-missing-files.tar.gz) = 1ea43b95953a00d0dc5637da9de1395d4ea6e7ef8a809a01a480888694eda93cc1c68e4d63cacf7735d6366b70bbb21632e617faf19390932a7cf382af447135 +SHA512 (rabbit-3.0.0.gem) = c3a1c25807057028017a48de389d2d4260bd75b2d13ec90b9f399388e0ed51bc40c72045a33146d0c9f3cbc60248116760361255c4ad7b693ed60d5ac61cdcf7 +SHA512 (rubygem-rabbit-3.0.0-test-missing-files.tar.gz) = 8d0ba5eac1fcb3b6307299feec0b055eec88414294bc653962d4c9b9d17ab9051eb466dbf27272fdf4b9ecf5512b185023d1c2fe314ddb174798add3d50c5809