Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade: skkdic version to 20240131 #11834

Open
wants to merge 1 commit into
base: 3.0-dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 36 additions & 36 deletions SPECS-EXTENDED/skkdic/license-investigation.txt
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
SKK-JISYO.JIS2 GPLv2+
SKK-JISYO.JIS2004 GPLv2+
SKK-JISYO.JIS3_4 GPLv2+
SKK-JISYO.L GPLv2+
SKK-JISYO.L.unannotated GPLv2+
SKK-JISYO.M GPLv2+
SKK-JISYO.ML GPLv2+
SKK-JISYO.S GPLv2+
SKK-JISYO.assoc GPLv2+
SKK-JISYO.china_taiwan GPLv2+
SKK-JISYO.china_taiwan.header GPLv2+
SKK-JISYO.edict CC-BY-SA (v3)
SKK-JISYO.edict2 CC-BY-SA (v3)
SKK-JISYO.emoji Unicode
SKK-JISYO.fullname GPLv2+
SKK-JISYO.geo GPLv2+
SKK-JISYO.hukugougo
SKK-JISYO.itaiji Public Domain
SKK-JISYO.itaiji.JIS3_4 GPLv2+
SKK-JISYO.ivd Unicode GPLv2+
SKK-JISYO.jinmei GPLv2+
SKK-JISYO.law GPLv2+
SKK-JISYO.lisp GPLv2+
SKK-JISYO.mazegaki GPLv2+
SKK-JISYO.noregist GPLv2+
SKK-JISYO.not_wrong GPLv2+
SKK-JISYO.notes GPLv2+
SKK-JISYO.JIS2 GPL-2.0-or-later
SKK-JISYO.JIS2004 GPL-2.0-or-later
SKK-JISYO.JIS3_4 GPL-2.0-or-later
SKK-JISYO.L GPL-2.0-or-later
SKK-JISYO.L.unannotated GPL-2.0-or-later
SKK-JISYO.M GPL-2.0-or-later
SKK-JISYO.ML GPL-2.0-or-later
SKK-JISYO.S GPL-2.0-or-later
SKK-JISYO.assoc GPL-2.0-or-later
SKK-JISYO.china_taiwan GPL-2.0-or-later
SKK-JISYO.china_taiwan.header GPL-2.0-or-later
SKK-JISYO.edict CC-BY-SA-3.0
SKK-JISYO.edict2 CC-BY-SA-3.0
SKK-JISYO.emoji Unicode-3.0
SKK-JISYO.fullname GPL-2.0-or-later
SKK-JISYO.geo GPL-2.0-or-later
SKK-JISYO.hukugougo GPL-2.0-or-later
SKK-JISYO.itaiji Public Domain NEEDCHECK
SKK-JISYO.itaiji.JIS3_4 GPL-2.0-or-later
SKK-JISYO.ivd Unicode-3.0
SKK-JISYO.jinmei GPL-2.0-or-later
SKK-JISYO.law GPL-2.0-or-later
SKK-JISYO.lisp GPL-2.0-or-later
SKK-JISYO.mazegaki GPL-2.0-or-later
SKK-JISYO.noregist GPL-2.0-or-later
SKK-JISYO.not_wrong GPL-2.0-or-later
SKK-JISYO.notes GPL-2.0-or-later
SKK-JISYO.office.zipcode Public Domain
SKK-JISYO.okinawa Public Domain
SKK-JISYO.pinyin GPLv1+
SKK-JISYO.propernoun GPLv2+
SKK-JISYO.pubdic+ MIT (HPND)
SKK-JISYO.requested GPLv2+
SKK-JISYO.station GPLv2+
SKK-JISYO.wrong GPLv2+
SKK-JISYO.wrong.annotated GPLv2+
SKK-JISYO.zipcode Public Domain
SKK-JISYO.okinawa Public Domain NEEDCHECK
SKK-JISYO.pinyin GPL-1.0-or-later
SKK-JISYO.propernoun GPL-2.0-or-later
SKK-JISYO.pubdic+ 0BSD
SKK-JISYO.requested GPL-2.0-or-later
SKK-JISYO.station GPL-2.0-or-later
SKK-JISYO.wrong GPL-2.0-or-later
SKK-JISYO.wrong.annotated GPL-2.0-or-later
SKK-JISYO.zipcode "not a license" https://gitlab.com/fedora/legal/fedora-license-data/-/issues/496

4 changes: 2 additions & 2 deletions SPECS-EXTENDED/skkdic/skkdic.signatures.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"Signatures": {
"README-skkdic.rh.ja": "6a8cfc3249680034b9b549042bed348e6d460783c4f66290e1cb02b3a45226dc",
"license-investigation.txt": "775a789e6981329816b279ecc855a01fd7f09273c4813e41b57d3495d643dd58",
"skkdic-20210217.git1ca80982c5a32c82bfc5e98e1fe9d8751ab44946.tar.gz": "6cceb1a9f4a7c20f83bbd2d85d9bdeef3381dc629f5fe1d2d2e6a378cf7eff1d",
"license-investigation.txt": "aff9d1ec3614d82b72341c2e4eafda998bd9a0a3d23b53cbe0e9d664f1a4ba39",
"skkdic-20240131.gitb798a46b886f71c0c25ad2a9e78b1c3e8933970c.tar.gz": "59b32e1a664ac8ed90f2ef8558f3d26eabeaa4e9de930b5b0ce9d3b85ed928cf",
"skkdic-LICENSE.txt": "dff86e06f127415191d952ded875e01f0d52ab1e52e21b81c4da4121dc12f686",
"unannotation.awk": "34bc5b7c1edb5296b0e1951f0340b68f5b7cf9a4a5ca54c71f45eb8700a293e9"
}
Expand Down
43 changes: 34 additions & 9 deletions SPECS-EXTENDED/skkdic/skkdic.spec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%global githash 1ca80982c5a32c82bfc5e98e1fe9d8751ab44946
%global githash b798a46b886f71c0c25ad2a9e78b1c3e8933970c
%global shorthash %(TMP=%githash ; echo ${TMP:0:10})
%global gitdate Wed, 17 Feb 2021 00:09:15 +0900
%global gitdate_num 20210217
%global gitdate Wed Jan 31 21:19:24 2024 +0900
%global gitdate_num 20240131

%global githash_tools 0fe2106fbc052445c611e6c5b2a79899d740edcb

Expand All @@ -10,7 +10,7 @@
Summary: Dictionaries for SKK (Simple Kana-Kanji conversion program)
Name: skkdic
Version: %{gitdate_num}
Release: 1%{?dist}
Release: 3%{?dist}
# See Source2
License: GPLv2+ and CC-BY-SA and Unicode and Public Domain and MIT

Expand Down Expand Up @@ -79,12 +79,37 @@ popd
%{_datadir}/skk/

%changelog
* Fri Dec 10 2021 Thomas Crain <[email protected]> - 20210217-1
- Upgrade using Fedora 35 version of spec (license: MIT)

* Thu Oct 14 2021 Pawel Winogrodzki <[email protected]> - 20200128-2
- Initial CBL-Mariner import from Fedora 31 (license: MIT).
* Thu Jan 09 2025 Archana Shettigar <[email protected]> - 20240131-3
- Initial Azure Linux import from Fedora 41 (license: MIT).
- Converting the 'Release' tag to the '[number].[distribution]' format.
- License Verified

* Sat Jul 20 2024 Fedora Release Engineering <[email protected]> - 20240131-2.gitb798a46b88
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

* Fri Apr 12 2024 Mamoru TASAKA <[email protected]> - 20240131-1.gitb798a46b88
- Update to 20240131 data

* Sat Jan 27 2024 Fedora Release Engineering <[email protected]> - 20210919-5.gitc6e6a8822b
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

* Sat Jul 22 2023 Fedora Release Engineering <[email protected]> - 20210919-4.gitc6e6a8822b
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

* Sat Jan 21 2023 Fedora Release Engineering <[email protected]> - 20210919-3.gitc6e6a8822b
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

* Sat Jul 23 2022 Fedora Release Engineering <[email protected]> - 20210919-2.gitc6e6a8822b
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

* Fri Mar 11 2022 Mamoru TASAKA <[email protected]> - 20210919-1.gitc6e6a8822b
- Update to 20210919 data

* Sat Jan 22 2022 Fedora Release Engineering <[email protected]> - 20210217-3.git1ca80982c5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

* Fri Jul 23 2021 Fedora Release Engineering <[email protected]> - 20210217-2.git1ca80982c5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

* Sat May 8 2021 Mamoru TASAKA <[email protected]> - 20210217-1.git1ca80982c5
- Source switched to github
Expand Down
4 changes: 2 additions & 2 deletions cgmanifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -27896,8 +27896,8 @@
"type": "other",
"other": {
"name": "skkdic",
"version": "20210217",
"downloadUrl": "https://github.com/skk-dev/dict/archive/1ca80982c5a32c82bfc5e98e1fe9d8751ab44946/skkdic-20210217.git1ca80982c5a32c82bfc5e98e1fe9d8751ab44946.tar.gz"
"version": "20240131",
"downloadUrl": "https://github.com/skk-dev/dict/archive/b798a46b886f71c0c25ad2a9e78b1c3e8933970c/skkdic-20240131.gitb798a46b886f71c0c25ad2a9e78b1c3e8933970c.tar.gz"
}
}
},
Expand Down