Accepting request 584425 from home:ftake:branches:M17N

- Update to ddskk-16.2
  * Drop support for GNU Emacs 22
  * Support GNU Emacs 26
  * bayesian/bskk: Support Ruby 2.4
  * A New variable, skk-candidate-buffer-delete-other-windows
    for users of popwin.el or shackle.el
  * A New variable, skk-show-candidates-nth-henkan-char
    to configure the number of space keys to show a candidate list
  * A New variable, skk-henkan-number-to-display-candidates
    to specify the number of candidates on a candidate list at once
    obsoleting skk-henkan-show-candidates-rows
- Update to ddskk-16.1
  * Support GNU Emacs 25
  * Update documents
- Update dictionary to 20180304
- Drop edict dictionary
  * edict is now considered as non-free
- Remove unnecessary documents
- Fix License tag since some dictionary files are not distributed
  under GPL-2.0+
- Update the source code URL to GitHub

OBS-URL: https://build.opensuse.org/request/show/584425
OBS-URL: https://build.opensuse.org/package/show/M17N/ddskk?expand=0&rev=22

README.SUSE

@@ -1,14 +1,4 @@
 # skk-dic
 
-get -c -r -np -k -L -p http://openlab.ring.gr.jp/skk/skk/dic/
+# visit the link and see the last modification time
-# 20150821: visit the link and see the last modification time
+./download-dic.sh 20180307
-cp -r openlab.ring.gr.jp/skk/skk/dic skkdic-20150821
-rm -rf skkdic-20150821/index*
-tar -cvf skkdic-20150821.tar skkdic-20150821
-xz -z -9 skkdic-20150821.tar
-
-# SKK-JISYO.wiki.20150326.bz2
-
-# 20150326: visit the page and see the last update time
-./SKK-JISYO > SKK-JISYO.wiki.20150326
-bzip2 -z -9 SKK-JISYO.wiki.20150326

SKK-JISYO.wiki.20150326.bz2

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

ddskk-16.2_Warabitai.tar.gz

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

ddskk-20150816.tar.gz

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

ddskk.changes

@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Wed Mar  7 14:51:08 UTC 2018 - ftake@geeko.jp
+
+- Update to ddskk-16.2
+  * Drop support for GNU Emacs 22
+  * Support GNU Emacs 26
+  * bayesian/bskk: Support Ruby 2.4
+  * A New variable, skk-candidate-buffer-delete-other-windows
+    for users of popwin.el or shackle.el
+  * A New variable, skk-show-candidates-nth-henkan-char
+    to configure the number of space keys to show a candidate list
+  * A New variable, skk-henkan-number-to-display-candidates
+    to specify the number of candidates on a candidate list at once
+    obsoleting skk-henkan-show-candidates-rows
+- Update to ddskk-16.1
+  * Support GNU Emacs 25
+  * Update documents
+- Update dictionary to 20180304
+- Drop edict dictionary
+  * edict is now considered as non-free
+- Remove unnecessary documents
+- Fix License tag since some dictionary files are not distributed
+  under GPL-2.0+
+- Update the source code URL to GitHub
+
 -------------------------------------------------------------------
 Sat Aug 12 06:12:08 UTC 2017 - bwiedemann@suse.com
 

ddskk.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package ddskk
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,20 +19,21 @@
 # Current version does not build with current xemacs, disable for now
 %define use_xemacs 0
 Name:           ddskk
-Version:        20150816
+Version:        20160304
 Release:        0
 Summary:        SKK (Simple Kana to Kanji Conversion Program) for Emacs
-License:        GPL-2.0+
+License:        GPL-2.0+ and SUSE-Permissive and SUSE-Public-Domain
 Group:          Productivity/Editors/Emacs
 Url:            http://openlab.ring.gr.jp/skk/ddskk.html
-Source0:        http://openlab.ring.gr.jp/skk/maintrunk/%{name}-%{version}.tar.gz
+Source0:        https://github.com/skk-dev/ddskk/archive/%{name}-16.2_Warabitai.tar.gz
 Source1:        suse-start.el
 Source97:       SKK-JISYO.rb
 Source98:       README.SUSE
 Source99:       ddskk-rpmlintrc
-# see README.SUSE
+# see README.SUSE for how to generate this file.
-Source100:      skkdic-20150821.tar.xz
+# NOTE: some dictionary files are not licenced under GPL-2.0+
-Source200:      SKK-JISYO.wiki.20150326.bz2
+# see commiters.txt
+Source100:      skkdic-20180304.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
@@ -96,20 +97,10 @@ Url:            http://openlab.ring.gr.jp/skk/dic.html
 optional, additional dictionaries for SKK
 
 %prep
-%setup -q
+%setup -q -n ddskk-ddskk-16.2_Warabitai
 %patch2 -p1
 %patch3 -p1
 tar --strip-components=1 --xz -xf %{S:100} -C dic
-pushd dic
-    ln -sf zipcode/SKK-JISYO.* .
-popd
-iconv -f iso-2022-jp -t utf-8 doc/skk.texi > doc/skk.texi.utf-8
-mv doc/skk.texi.utf-8 doc/skk.texi
-perl -pi -e "s/coding: iso-2022-jp/coding: utf-8/" doc/skk.texi
-# check if changing the encoding cookie worked, exit if not:
-grep "coding: utf-8" doc/skk.texi || exit 1
-# unpack dictionaries' introduction
-cp %{S:200} . && bzip2 -d *.bz2
 
 %build
 %define emacs_sitelisp_dir %{_datadir}/emacs/site-lisp
@@ -192,6 +183,8 @@ fi
 %{emacs_package_dir}
 %config %{emacs_sitelisp_dir}/suse-start-%{name}.el
 %{_infodir}/*
+%exclude %{_datadir}/doc/packages/ddskk/READMEs/README.MacOSX.ja
+%exclude %{_datadir}/doc/packages/ddskk/READMEs/README.w32.ja.org
 
 %if %{use_xemacs}
 %files -n ddskk-xemacs
@@ -206,7 +199,8 @@ fi
 
 %files -n skkdic
 %defattr(-,root,root)
-%doc dic/ChangeLog* dic/edict_doc.txt dic/READMEs/committers.txt dic/zipcode/README.ja SKK-JISYO.wiki.20150326 
+%doc dic/ChangeLog*
+%license dic/READMEs/committers.txt
 %dir %{_datadir}/skk/
 %{_datadir}/skk/SKK-JISYO.L
 %{_datadir}/skk/skk.xpm
@@ -220,6 +214,7 @@ fi
 %{_datadir}/skk/SKK-JISYO.M
 %{_datadir}/skk/SKK-JISYO.zipcode
 %{_datadir}/skk/SKK-JISYO.office.zipcode
+# SUSE-Permissive
 %{_datadir}/skk/SKK-JISYO.pubdic+
 %{_datadir}/skk/SKK-JISYO.JIS3_4
 %{_datadir}/skk/SKK-JISYO.JIS2
@@ -234,6 +229,7 @@ fi
 %{_datadir}/skk/SKK-JISYO.itaiji.JIS3_4
 %{_datadir}/skk/SKK-JISYO.jinmei
 %{_datadir}/skk/SKK-JISYO.law
+%{_datadir}/skk/SKK-JISYO.lisp
 %{_datadir}/skk/SKK-JISYO.mazegaki
 %{_datadir}/skk/SKK-JISYO.okinawa
 %{_datadir}/skk/SKK-JISYO.propernoun

download-dic.sh

@@ -0,0 +1,21 @@
+#!/bin/sh
+
+if [ -z $1 ]; then
+    echo Usage: download-dic.sh YYYYMMDD
+    exit 1;
+fi
+
+dest=skkdic-$1
+rm -r $dest
+# wget -c -r -np -k -L -p http://openlab.ring.gr.jp/skk/skk/dic/
+mkdir -p $dest
+find openlab.ring.gr.jp/skk/skk/dic -name "SKK-JISYO.*" -exec cp {} $dest \;
+
+# remove dictionaries that cannot be packaged
+rm -f $dest/dic/SKK-JISYO.edict
+
+mkdir -p $dest/READMEs
+cp openlab.ring.gr.jp/skk/skk/dic/READMEs/committers.txt $dest/READMEs
+cp openlab.ring.gr.jp/skk/skk/dic/ChangeLog* $dest
+
+tar cvJf skkdic-$1.tar.xz $dest

skkdic-20150821.tar.xz

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

skkdic-20180304.tar.xz

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