Compare commits
52 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1ba1b93004 | ||
|
|
5aadb41286 | ||
|
|
9b6e18fcec | ||
|
|
00a732044b | ||
|
|
949f285e36 | ||
|
|
109070798c | ||
|
|
12c6158de4 | ||
|
|
a5d65237a4 | ||
|
|
6cec786ffa | ||
|
|
41cbcc573e | ||
|
|
1fe928932e | ||
|
|
f9a0b3fa85 | ||
|
|
691032f440 | ||
|
|
31b4a374c8 | ||
|
|
76d95a5734 | ||
|
|
1a51c9c120 | ||
|
|
eabf7c391e | ||
|
|
70f4403c22 | ||
|
|
a467a6cacd | ||
|
|
82be5ceb35 | ||
|
|
f96ed439a1 | ||
|
|
74b32b8ba4 | ||
|
|
9a3aba444c | ||
|
|
e9b2d033af | ||
|
|
aa94673295 | ||
|
|
14d652ad47 | ||
|
|
43e8177c7d | ||
|
|
977f4d08a9 | ||
|
|
86b254a2d8 | ||
|
|
64034f795f | ||
|
|
a23e2c8e06 | ||
|
|
7f0f31e027 | ||
|
|
11a3878795 | ||
|
|
1cd13accc1 | ||
|
|
8b05d938d6 | ||
|
|
06d19d93b6 | ||
|
|
bdd53c3c9c | ||
|
|
71061ad7eb | ||
|
|
35efac3cbc | ||
|
|
ed57d046ce | ||
|
|
16a6dbe406 | ||
|
|
a43fd425de | ||
|
|
537ac10273 | ||
|
|
77fc01a255 | ||
|
|
455dc54432 | ||
|
|
dc0e79d64f | ||
|
|
44ea804e00 | ||
|
|
fa0f46c70b | ||
|
|
77538bbfa0 | ||
|
|
0d12acfda0 | ||
|
|
a52a23f67a | ||
|
|
5b3fd3efd6 |
5 changed files with 218 additions and 81 deletions
7
.gitignore
vendored
7
.gitignore
vendored
|
|
@ -1,5 +1,2 @@
|
|||
/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-*.gem
|
||||
/rubygem-rabbit-*-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,29 +0,0 @@
|
|||
From 9e788e7f2a5b28748b6e55d9444a7e0428461145 Mon Sep 17 00:00:00 2001
|
||||
From: Kouhei Sutou <kou@clear-code.com>
|
||||
Date: Mon, 4 Aug 2014 21:37:04 +0900
|
||||
Subject: [PATCH] logger: replace invalid and undefined characters in encode
|
||||
error message
|
||||
|
||||
[shocker-ja:1228]
|
||||
|
||||
Reported by OBATA Akio. Thanks!!!
|
||||
---
|
||||
lib/rabbit/logger/stderr.rb | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/rabbit/logger/stderr.rb b/lib/rabbit/logger/stderr.rb
|
||||
index b5081ab..f2bf450 100644
|
||||
--- a/lib/rabbit/logger/stderr.rb
|
||||
+++ b/lib/rabbit/logger/stderr.rb
|
||||
@@ -13,7 +13,10 @@ def do_log(severity, prog_name, message)
|
||||
message = message.encode("locale")
|
||||
rescue EncodingError
|
||||
format = _("can't convert to current locale from UTF-8: %s")
|
||||
- $stderr.puts(format % message.encode(format.encoding))
|
||||
+ sanitized_message = message.encode(format.encoding,
|
||||
+ :invalid => :replace,
|
||||
+ :undef => :replace)
|
||||
+ $stderr.puts(format % sanitized_message)
|
||||
end
|
||||
$stderr.puts(format_severity(severity))
|
||||
$stderr.print("[#{prog_name}]: ") if prog_name
|
||||
|
|
@ -5,46 +5,67 @@ BuildRequires: %1 \
|
|||
%{nil}
|
||||
|
||||
Name: rubygem-%{gem_name}
|
||||
Version: 2.1.3
|
||||
Release: 3%{?dist}
|
||||
Version: 4.0.1
|
||||
Release: 1%{?dist}
|
||||
|
||||
Summary: RD-document-based presentation application
|
||||
# CC-BY: rubykaigi2011-background-white.jpg and
|
||||
# rubykaigi2011-background-black.jpg
|
||||
# (see doc/en/index.rd)
|
||||
License: GPLv2+ and CC-BY
|
||||
# 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
|
||||
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}-2.1.2-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
|
||||
Source11: rabbit.xml
|
||||
# http://www.cozmixng.org/~w3ml/index.rb/rabbit-shocker/msg/1228
|
||||
# https://github.com/rabbit-shocker/rabbit/commit/9e788e7f2a5b28748b6e55d9444a7e0428461145.patch
|
||||
Patch0: rubygem-rabbit-2.1.3-replace-invalid-character.patch
|
||||
|
||||
%BothRequires ruby(release)
|
||||
BuildRequires: rubygems-devel
|
||||
Requires: ruby(rubygems)
|
||||
|
||||
%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(gtk2)
|
||||
%BothRequires rubygem(gdk_pixbuf2)
|
||||
%BothRequires rubygem(gtk3)
|
||||
%BothRequires rubygem(hikidoc)
|
||||
%BothRequires rubygem(kramdown)
|
||||
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)
|
||||
%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)
|
||||
|
|
@ -58,7 +79,6 @@ Rabbit is an RD-document-based presentation application.
|
|||
|
||||
%package doc
|
||||
Summary: Documentation for %{name}
|
||||
Group: Documentation
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
BuildArch: noarch
|
||||
|
||||
|
|
@ -66,17 +86,20 @@ BuildArch: noarch
|
|||
Documentation for %{name}
|
||||
|
||||
%prep
|
||||
gem unpack %{SOURCE0}
|
||||
%setup -q -D -T -n %{gem_name}-%{version}
|
||||
%autosetup -n %{gem_name}-%{version} -a 1 -p 1
|
||||
mv ../%{gem_name}-%{version}.gemspec .
|
||||
|
||||
%patch0 -p1
|
||||
# Remove gtk4 dependency
|
||||
sed -i %{gem_name}-%{version}.gemspec \
|
||||
-e '\@add_runtime_dependency.*gtk4@d'
|
||||
|
||||
gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
|
||||
|
||||
%build
|
||||
gem build %{gem_name}.gemspec
|
||||
gem build %{gem_name}-%{version}.gemspec
|
||||
%gem_install
|
||||
|
||||
cp -a %{gem_name}-%{version}/test/ ./%{gem_instdir}/
|
||||
|
||||
%install
|
||||
mkdir -p %{buildroot}%{gem_dir}
|
||||
cp -pa .%{gem_dir}/* \
|
||||
|
|
@ -104,9 +127,12 @@ 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/
|
||||
test/ \
|
||||
%{nil}
|
||||
popd
|
||||
|
||||
%find_lang rabbit
|
||||
|
|
@ -117,32 +143,17 @@ do
|
|||
done
|
||||
|
||||
%check
|
||||
# test files are not included in binary rpm, so just
|
||||
# unpack here
|
||||
LANG=C.utf8
|
||||
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 \
|
||||
ruby test/run-test.rb
|
||||
popd
|
||||
|
||||
%post
|
||||
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
|
||||
touch --no-create %{_datadir}/mime/packages &> /dev/null || :
|
||||
update-desktop-database &> /dev/null || :
|
||||
|
||||
%postun
|
||||
update-desktop-database &> /dev/null || :
|
||||
if [ $1 -eq 0 ]; then
|
||||
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
|
||||
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
touch --no-create %{_datadir}/mime/packages &> /dev/null || :
|
||||
update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
|
||||
fi
|
||||
|
||||
%posttrans
|
||||
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
|
||||
|
||||
%files -f rabbit.lang
|
||||
# rpmlint: keep all zero-length file
|
||||
%dir %{gem_instdir}
|
||||
|
|
@ -177,6 +188,129 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
|
|||
%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
|
||||
|
||||
* 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
|
||||
- F-34: add rubygem(rexml) dep
|
||||
|
||||
* Mon Feb 1 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.0.0-6
|
||||
- Remove old kramdown depedency stuff
|
||||
- Add upstream URI.open patch to suppress warnings
|
||||
|
||||
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Fri Jan 31 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.0.0-3
|
||||
- BR: rubygem(racc) for test
|
||||
|
||||
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Fri Sep 13 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.0.0-2
|
||||
- Stop to use RPM rich dependency - does not seem to do as I expect
|
||||
|
||||
* Mon Sep 9 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 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 <releng@fedoraproject.org> - 2.2.1-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.1-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.1-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Thu Jan 18 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2.2.1-2
|
||||
- Remove obsolete scriptlets
|
||||
|
||||
* Tue Sep 19 2017 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.2.1-1
|
||||
- 2.2.1
|
||||
|
||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Mon Jan 23 2017 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.2.0-1
|
||||
- 2.2.0
|
||||
|
||||
* Wed Jun 8 2016 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.1.9-1
|
||||
- 2.1.9
|
||||
|
||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.8-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Sun Sep 13 2015 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.1.8-1
|
||||
- 2.1.8
|
||||
|
||||
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.6-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Fri Feb 27 2015 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.1.6-1
|
||||
- 2.1.6
|
||||
|
||||
* Tue Feb 24 2015 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.1.4-1
|
||||
- 2.1.4
|
||||
|
||||
* Fri Nov 7 2014 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.1.3-3
|
||||
- Rescue Encoding::UndefinedConversionError on logger
|
||||
(shocker-ja:1228)
|
||||
|
|
|
|||
4
sources
4
sources
|
|
@ -1,2 +1,2 @@
|
|||
d5b5d3be4def7d1c066265d3fa221bb6 rabbit-2.1.3.gem
|
||||
99fab8a244fd2d1cbddccd33e8be8896 rubygem-rabbit-2.1.2-test-missing-files.tar.gz
|
||||
SHA512 (rabbit-4.0.1.gem) = db17048007f938ff201b5598dc8680c04fb9aeb3f1f02955515457093fa07c38e22450fe6c4f2ca34a527e17060f6a623a7adefd2fef3f65c3a67d3665be1d35
|
||||
SHA512 (rubygem-rabbit-4.0.1-test-missing-files.tar.gz) = 1ea43b95953a00d0dc5637da9de1395d4ea6e7ef8a809a01a480888694eda93cc1c68e4d63cacf7735d6366b70bbb21632e617faf19390932a7cf382af447135
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue