Accepting request 781060 from M17N

OBS-URL: https://build.opensuse.org/request/show/781060
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ddskk?expand=0&rev=27

ddskk.changes

@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Mon Mar  2 17:24:07 UTC 2020 - Xu Zhao <i@xuzhao.net>
+
+- Update to skkdic 20200228
+  * SKK-JISYO.L: Modify below candidates.
+    - よもつひらさか /黄泉平坂/{->黄泉比良坂;古事記/泉津平坂;日本書紀/}
+    - やつめうなぎ /八目鰻{鱧/->}/
+    - ばっさい /伐採/{伐裁/->}
+    - せんけん /先遣/先見/専権/先験/浅見/淺見;「浅」旧字/先件/嬋娟;-たる美女/仙建/擅権/選研/選鉱{精->製}錬研究所;※abbrev/
+    - よいざm /酔い覚{;->}/酔い醒/酔醒/
+  * SKK-JISYO.L: Remove below candidates.
+    - かみきょうく /上京区/
+    - にしぎょうく /西京区/
+    - さいきょうく /西京区/
+    - ちゅうきょうく /中京区/
+    - しゅんとうぐん /駿東郡/
+  * SKK-JISYO.L: Add below candidates.
+    - うきょうく /右京区/
+    - かみぎょうく /上京区/
+    - しもぎょうく /下京区/
+    - なかぎょうく /中京区/
+    - にしきょうく /西京区/
+    - ひがしやまく /東山区/
+    - すんとうぐん /駿東郡/
+
 -------------------------------------------------------------------
 Thu Mar  8 15:33:31 UTC 2018 - ftake@geeko.jp
 

ddskk.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package ddskk
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -22,9 +22,9 @@ Name:           ddskk
 Version:        20160304
 Release:        0
 Summary:        SKK (Simple Kana to Kanji Conversion Program) for Emacs
-License:        GPL-2.0+ and SUSE-Permissive and SUSE-Public-Domain
+License:        GPL-2.0-or-later AND SUSE-Permissive AND SUSE-Public-Domain
 Group:          Productivity/Editors/Emacs
-Url:            http://openlab.ring.gr.jp/skk/ddskk.html
+URL:            http://openlab.ring.gr.jp/skk/ddskk.html
 Source0:        https://github.com/skk-dev/ddskk/archive/%{name}-16.2_Warabitai.tar.gz
 Source1:        suse-start.el
 Source97:       download-dic.sh
@@ -33,7 +33,7 @@ Source99:       ddskk-rpmlintrc
 # see README.SUSE for how to generate this file.
 # NOTE: some dictionary files are not licenced under GPL-2.0+
 # see commiters.txt
-Source100:      skkdic-20180304.tar.xz
+Source100:      skkdic-20200228.tar.xz
 Patch2:         bugzilla-141756-workaround.patch
 # PATCH-FIX-OPENSUSE or UPSTREAM -- drop build date to make build reproducible
 Patch3:         ddskk-drop-build-date.patch
@@ -79,7 +79,7 @@ aggressively developed.
 %package -n skkdic
 Summary:        Main Dictionary for SKK
 Group:          System/I18n/Japanese
-Url:            http://openlab.ring.gr.jp/skk/dic.html
+URL:            http://openlab.ring.gr.jp/skk/dic.html
 Requires(post):	info
 Requires(preun):	info
 Provides:       locale(scim-skk:ja)
@@ -90,7 +90,7 @@ main dictionary for SKK
 %package -n skkdic-extra
 Summary:        Optional, additional dictionaries for SKK
 Group:          System/I18n/Japanese
-Url:            http://openlab.ring.gr.jp/skk/dic.html
+URL:            http://openlab.ring.gr.jp/skk/dic.html
 
 %description -n skkdic-extra
 optional, additional dictionaries for SKK
@@ -100,6 +100,7 @@ optional, additional dictionaries for SKK
 %patch2 -p1
 %patch3 -p1
 tar --strip-components=1 --xz -xf %{S:100} -C dic
+cp dic/zipcode/SKK-JISYO.* dic/
 
 %build
 %define emacs_sitelisp_dir %{_datadir}/emacs/site-lisp
@@ -199,7 +200,7 @@ fi
 %files -n skkdic
 %defattr(-,root,root)
 %doc dic/ChangeLog*
-%license dic/READMEs/committers.txt
+%license dic/committers.txt
 %dir %{_datadir}/skk/
 %{_datadir}/skk/SKK-JISYO.L
 %{_datadir}/skk/skk.xpm

skkdic-20180304.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b812960da5bc4204c2f2bb30b372b63df7ec7c74c1961c1bff41f7528fa900bd
-size 11865632

skkdic-20200228.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:aee573ff106b8faf2500d7c05e0b6a626a418ec6c29bc29a173be91b40390902
+size 6272516