Compare commits
19 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1ba1b93004 | ||
|
|
5aadb41286 | ||
|
|
9b6e18fcec | ||
|
|
00a732044b | ||
|
|
949f285e36 | ||
|
|
109070798c | ||
|
|
12c6158de4 | ||
|
|
a5d65237a4 | ||
|
|
6cec786ffa | ||
|
|
41cbcc573e | ||
|
|
1fe928932e | ||
|
|
f9a0b3fa85 | ||
|
|
691032f440 | ||
|
|
31b4a374c8 | ||
|
|
76d95a5734 | ||
|
|
1a51c9c120 | ||
|
|
eabf7c391e | ||
|
|
70f4403c22 | ||
|
|
a467a6cacd |
6 changed files with 135 additions and 80 deletions
18
.gitignore
vendored
18
.gitignore
vendored
|
|
@ -1,16 +1,2 @@
|
||||||
/rabbit-2.1.1.gem
|
/rabbit-*.gem
|
||||||
/rubygem-rabbit-2.1.1-test-missing-files.tar.gz
|
/rubygem-rabbit-*-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
|
|
||||||
|
|
|
||||||
35
rabbit-create-missing-test-files.sh
Normal file
35
rabbit-create-missing-test-files.sh
Normal file
|
|
@ -0,0 +1,35 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
usage() {
|
||||||
|
echo "$0 <VERSION>"
|
||||||
|
}
|
||||||
|
|
||||||
|
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
|
||||||
|
|
||||||
|
|
@ -1,15 +0,0 @@
|
||||||
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"
|
|
||||||
|
|
||||||
|
|
@ -1,22 +0,0 @@
|
||||||
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
|
|
||||||
|
|
@ -5,23 +5,26 @@ BuildRequires: %1 \
|
||||||
%{nil}
|
%{nil}
|
||||||
|
|
||||||
Name: rubygem-%{gem_name}
|
Name: rubygem-%{gem_name}
|
||||||
Version: 3.0.0
|
Version: 4.0.1
|
||||||
Release: 7%{?dist}
|
Release: 1%{?dist}
|
||||||
|
|
||||||
Summary: RD-document-based presentation application
|
Summary: RD-document-based presentation application
|
||||||
# CC-BY: rubykaigi2011-background-white.jpg and
|
# GPL-2.0-or-later: overall
|
||||||
# rubykaigi2011-background-black.jpg
|
# The following is obtained from:
|
||||||
# (see doc/en/index.rd)
|
# https://www.w3.org/TR/MathML2/chapter6.html#chars.entity.tables , so from
|
||||||
License: GPLv2+ and CC-BY
|
# 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
|
||||||
URL: http://rabbit-shocker.org/
|
URL: http://rabbit-shocker.org/
|
||||||
Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
|
Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
|
||||||
# https://github.com/rabbit-shocker/rabbit/commit/befb9f8cdc63b39b9e778b36ffd2c1d53e1d91ee
|
|
||||||
Patch1: rubygem-rabbit-3.0.0-use-url-open.patch
|
|
||||||
# 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: %{name}-%{version}-test-missing-files.tar.gz
|
||||||
|
# Source1 is created by $ bash %%SOURCE2 %%version
|
||||||
|
Source2: rabbit-create-missing-test-files.sh
|
||||||
Source10: rabbit.desktop
|
Source10: rabbit.desktop
|
||||||
Source11: rabbit.xml
|
Source11: rabbit.xml
|
||||||
|
|
||||||
|
|
@ -30,7 +33,10 @@ BuildRequires: rubygems-devel
|
||||||
Requires: ruby(rubygems)
|
Requires: ruby(rubygems)
|
||||||
|
|
||||||
%BothRequires rubygem(coderay)
|
%BothRequires rubygem(coderay)
|
||||||
%BothRequires rubygem(faraday)
|
%BothRequires rubygem(csv)
|
||||||
|
%BothRequires rubygem(drb)
|
||||||
|
# Dependency removed on 3.0.2
|
||||||
|
#%%BothRequires rubygem(faraday)
|
||||||
%BothRequires rubygem(gettext)
|
%BothRequires rubygem(gettext)
|
||||||
%BothRequires rubygem(gdk_pixbuf2)
|
%BothRequires rubygem(gdk_pixbuf2)
|
||||||
%BothRequires rubygem(gtk3)
|
%BothRequires rubygem(gtk3)
|
||||||
|
|
@ -40,15 +46,20 @@ Requires: rubygem-kramdown >= 2.0
|
||||||
%BothRequires rubygem(kramdown-parser-gfm)
|
%BothRequires rubygem(kramdown-parser-gfm)
|
||||||
%BothRequires rubygem(nokogiri)
|
%BothRequires rubygem(nokogiri)
|
||||||
%BothRequires rubygem(poppler)
|
%BothRequires rubygem(poppler)
|
||||||
|
%BothRequires rubygem(ostruct)
|
||||||
%BothRequires rubygem(rouge)
|
%BothRequires rubygem(rouge)
|
||||||
%BothRequires rubygem(rsvg2)
|
%BothRequires rubygem(rsvg2)
|
||||||
%BothRequires rubygem(rdtool)
|
%BothRequires rubygem(rdtool)
|
||||||
%BothRequires rubygem(rttool)
|
%BothRequires rubygem(rttool)
|
||||||
%if 0%{?fedora} >= 34
|
|
||||||
%BothRequires rubygem(rexml)
|
%BothRequires rubygem(rexml)
|
||||||
%endif
|
|
||||||
# test_codeblock_fence test needs below
|
# 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
|
BuildRequires: %{_bindir}/blockdiag
|
||||||
|
%endif
|
||||||
BuildRequires: desktop-file-utils
|
BuildRequires: desktop-file-utils
|
||||||
# For rabbirc
|
# For rabbirc
|
||||||
Requires: rubygem(net-irc)
|
Requires: rubygem(net-irc)
|
||||||
|
|
@ -75,17 +86,20 @@ BuildArch: noarch
|
||||||
Documentation for %{name}
|
Documentation for %{name}
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
gem unpack %{SOURCE0}
|
%autosetup -n %{gem_name}-%{version} -a 1 -p 1
|
||||||
%setup -q -D -T -n %{gem_name}-%{version}
|
mv ../%{gem_name}-%{version}.gemspec .
|
||||||
|
|
||||||
gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
|
# Remove gtk4 dependency
|
||||||
|
sed -i %{gem_name}-%{version}.gemspec \
|
||||||
|
-e '\@add_runtime_dependency.*gtk4@d'
|
||||||
|
|
||||||
%patch1 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
gem build %{gem_name}.gemspec
|
gem build %{gem_name}-%{version}.gemspec
|
||||||
%gem_install
|
%gem_install
|
||||||
|
|
||||||
|
cp -a %{gem_name}-%{version}/test/ ./%{gem_instdir}/
|
||||||
|
|
||||||
%install
|
%install
|
||||||
mkdir -p %{buildroot}%{gem_dir}
|
mkdir -p %{buildroot}%{gem_dir}
|
||||||
cp -pa .%{gem_dir}/* \
|
cp -pa .%{gem_dir}/* \
|
||||||
|
|
@ -113,9 +127,12 @@ install -cpm 644 .%{gem_instdir}/sample/rabbit_icon.png \
|
||||||
# Cleanup
|
# Cleanup
|
||||||
pushd %{buildroot}%{gem_instdir}
|
pushd %{buildroot}%{gem_instdir}
|
||||||
rm -rf \
|
rm -rf \
|
||||||
Gemfile Rakefile %{gem_name}.gemspec \
|
Gemfile \
|
||||||
|
Rakefile \
|
||||||
|
%{gem_name}.gemspec \
|
||||||
po/ \
|
po/ \
|
||||||
test/
|
test/ \
|
||||||
|
%{nil}
|
||||||
popd
|
popd
|
||||||
|
|
||||||
%find_lang rabbit
|
%find_lang rabbit
|
||||||
|
|
@ -127,10 +144,12 @@ done
|
||||||
|
|
||||||
%check
|
%check
|
||||||
LANG=C.utf8
|
LANG=C.utf8
|
||||||
# test files are not included in binary rpm, so just
|
|
||||||
# unpack here
|
|
||||||
pushd .%{gem_instdir}
|
pushd .%{gem_instdir}
|
||||||
gzip -dc %{SOURCE1} | tar -xf -
|
|
||||||
|
# F-39: skip blockdiag related test
|
||||||
|
sed -i.skip test/parser/test-markdown.rb \
|
||||||
|
-e 's|\(def test_codeblock_fence\)|\1 ; omit|'
|
||||||
|
|
||||||
xvfb-run \
|
xvfb-run \
|
||||||
ruby test/run-test.rb
|
ruby test/run-test.rb
|
||||||
popd
|
popd
|
||||||
|
|
@ -169,6 +188,58 @@ popd
|
||||||
%doc %{gem_instdir}/sample/
|
%doc %{gem_instdir}/sample/
|
||||||
|
|
||||||
%changelog
|
%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
|
||||||
|
|
||||||
|
* Tue Sep 28 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.0.1-1
|
||||||
|
- 3.0.1
|
||||||
|
|
||||||
|
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0-8
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||||
|
|
||||||
* Fri Mar 12 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.0.0-7
|
* Fri Mar 12 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.0.0-7
|
||||||
- F-34: add rubygem(rexml) dep
|
- F-34: add rubygem(rexml) dep
|
||||||
|
|
||||||
|
|
|
||||||
4
sources
4
sources
|
|
@ -1,2 +1,2 @@
|
||||||
SHA512 (rabbit-3.0.0.gem) = c3a1c25807057028017a48de389d2d4260bd75b2d13ec90b9f399388e0ed51bc40c72045a33146d0c9f3cbc60248116760361255c4ad7b693ed60d5ac61cdcf7
|
SHA512 (rabbit-4.0.1.gem) = db17048007f938ff201b5598dc8680c04fb9aeb3f1f02955515457093fa07c38e22450fe6c4f2ca34a527e17060f6a623a7adefd2fef3f65c3a67d3665be1d35
|
||||||
SHA512 (rubygem-rabbit-3.0.0-test-missing-files.tar.gz) = 8d0ba5eac1fcb3b6307299feec0b055eec88414294bc653962d4c9b9d17ab9051eb466dbf27272fdf4b9ecf5512b185023d1c2fe314ddb174798add3d50c5809
|
SHA512 (rubygem-rabbit-4.0.1-test-missing-files.tar.gz) = 1ea43b95953a00d0dc5637da9de1395d4ea6e7ef8a809a01a480888694eda93cc1c68e4d63cacf7735d6366b70bbb21632e617faf19390932a7cf382af447135
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue