Compare commits

..

No commits in common. "rawhide" and "f36" have entirely different histories.

6 changed files with 69 additions and 84 deletions

20
.gitignore vendored
View file

@ -1,2 +1,18 @@
/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
/rabbit-3.0.1.gem
/rubygem-rabbit-3.0.1-test-missing-files.tar.gz

View file

@ -28,7 +28,7 @@ git reset --hard $VERSION
cd ..
ln -sf ${GEMNAME} ${GEMNAME}-${VERSION}
tar czf $CURDIR/rubygem-${GEMNAME}-${VERSION}-test-missing-files.tar.gz ${GEMNAME}-${VERSION}/./test/
tar czf $CURDIR/rubygem-${GEMNAME}-${VERSION}-test-missing-files.tar.gz ${GEMNAME}-${VERSION}/./test/fixtures/
popd
rm -rf $TMPDIR

View file

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

View file

@ -0,0 +1,22 @@
From befb9f8cdc63b39b9e778b36ffd2c1d53e1d91ee Mon Sep 17 00:00:00 2001
From: kojix2 <2xijok@gmail.com>
Date: Fri, 31 Jan 2020 14:12:53 +0900
Subject: [PATCH] Use URI.open (#133)
---
lib/rabbit/parser/ext/image.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/rabbit/parser/ext/image.rb b/lib/rabbit/parser/ext/image.rb
index 20d517de..46f33e05 100644
--- a/lib/rabbit/parser/ext/image.rb
+++ b/lib/rabbit/parser/ext/image.rb
@@ -109,7 +109,7 @@ def other_uri_filename(canvas, uri)
def setup_image_file(canvas, uri, filename)
begin
- open(uri, "rb") do |in_file|
+ URI.open(uri, "rb") do |in_file|
File.open(filename, "wb") do |out|
out.print(in_file.read)
end

View file

@ -5,21 +5,14 @@ BuildRequires: %1 \
%{nil}
Name: rubygem-%{gem_name}
Version: 4.0.1
Release: 1%{?dist}
Version: 3.0.1
Release: 2%{?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
Source1: %{name}-%{version}-test-missing-files.tar.gz
@ -33,10 +26,7 @@ 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)
@ -46,20 +36,15 @@ Requires: rubygem-kramdown >= 2.0
%BothRequires 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)
%if 0%{?fedora} >= 34
%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
# test_codeblock_fence test needs below
BuildRequires: %{_bindir}/blockdiag
BuildRequires: desktop-file-utils
# For rabbirc
Requires: rubygem(net-irc)
@ -89,16 +74,11 @@ Documentation for %{name}
%autosetup -n %{gem_name}-%{version} -a 1 -p 1
mv ../%{gem_name}-%{version}.gemspec .
# Remove gtk4 dependency
sed -i %{gem_name}-%{version}.gemspec \
-e '\@add_runtime_dependency.*gtk4@d'
%build
gem build %{gem_name}-%{version}.gemspec
%gem_install
cp -a %{gem_name}-%{version}/test/ ./%{gem_instdir}/
cp -a %{gem_name}-%{version}/test/* ./%{gem_instdir}/test/
%install
mkdir -p %{buildroot}%{gem_dir}
@ -145,11 +125,6 @@ done
%check
LANG=C.utf8
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|'
xvfb-run \
ruby test/run-test.rb
popd
@ -188,49 +163,6 @@ popd
%doc %{gem_instdir}/sample/
%changelog
* Thu Aug 21 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4.0.1-1
- 4.0.1
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Tue Apr 01 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.0.5-1
- 3.0.5
* Mon Mar 24 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.0.4-1
- 3.0.4
* Sat Jan 18 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.3-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.3-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.3-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Wed Jul 5 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 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 <mtasaka@fedoraproject.org> - 3.0.3-1
- 3.0.3
* Sat Jul 1 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.0.2-2
- SPDX migration
* Sat Jul 1 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.0.2-1
- 3.0.2
* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

View file

@ -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.1.gem) = 67e69dcaa285e04af39c6dec5bc022200a4b2f78d31b5e96d8123909a0eafb75a594e970bbf6196f747900b0e7f786abf59f6104fe9c8833a30c5fe4848d8f98
SHA512 (rubygem-rabbit-3.0.1-test-missing-files.tar.gz) = 6e0b3499adab307f01a6615c79506bbf54c04417b78863b64cfa1b697619380049af19cd3a17faffe5d6a67a465dde500d49b2a8480a5f84d718657be0dfaa7a