Accepting request 325060 from home:MargueriteSu:branches:M17N

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

ddskk.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package ddskk
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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,19 +19,20 @@
 # Current version does not build with current xemacs, disable for now
 %define use_xemacs 0
 Name:           ddskk
-Version:        20140608
+Version:        20150816
 Release:        0
 Summary:        SKK (Simple Kana to Kanji Conversion Program) for Emacs
 License:        GPL-2.0+
 Group:          Productivity/Editors/Emacs
-Url:            http://openlab.jp/skk/index.html
+Url:            http://openlab.ring.gr.jp/skk/ddskk.html
 Source0:        http://openlab.ring.gr.jp/skk/maintrunk/%{name}-%{version}.tar.gz
 Source1:        suse-start.el
-# it's a dump of http://openlab.ring.gr.jp/skk/skk/dic/
-Source100:      skkdic-20140609.tar.xz
-# wiki page in plaintext to explain skk dictionaries
-Source200:      SKK-JISYO.wiki.bz2
-Source300:      ddskk-rpmlintrc
+Source97:       SKK-JISYO.rb
+Source98:       README.SUSE
+Source99:       ddskk-rpmlintrc
+# see README.SUSE
+Source100:      skkdic-20150821.tar.xz
+Source200:      SKK-JISYO.wiki.20150326.bz2
 Patch2:         bugzilla-141756-workaround.patch
 BuildRequires:  compface
 BuildRequires:  emacs-x11
@@ -40,9 +41,9 @@ BuildRequires:  w3m
 BuildRequires:  xorg-x11-devel
 BuildRequires:  xz
 %if %{use_xemacs}
-BuildRequires:  flim-xemacs
-BuildRequires:  semi-xemacs
+BuildRequires:  xemacs-flim
 BuildRequires:  xemacs-packages
+BuildRequires:  xemacs-semi
 %endif
 Requires:       apel
 Requires:       emacs
@@ -76,7 +77,7 @@ aggressively developed.
 %package -n skkdic
 Summary:        Main Dictionary for SKK
 Group:          System/I18n/Japanese
-Url:            http://openlab.jp/skk/dic.html
+Url:            http://openlab.ring.gr.jp/skk/dic.html
 Requires(post):	info
 Requires(preun):	info
 Provides:       locale(scim-skk:ja)
@@ -87,13 +88,13 @@ main dictionary for SKK
 %package -n skkdic-extra
 Summary:        Optional, additional dictionaries for SKK
 Group:          System/I18n/Japanese
-Url:            http://openlab.jp/skk/dic.html
+Url:            http://openlab.ring.gr.jp/skk/dic.html
 
 %description -n skkdic-extra
 optional, additional dictionaries for SKK
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 %patch2 -p1
 tar --strip-components=1 --xz -xf %{S:100} -C dic
 pushd dic
@@ -104,6 +105,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
@@ -200,7 +203,7 @@ fi
 
 %files -n skkdic
 %defattr(-,root,root)
-%doc dic/ChangeLog* dic/edict_doc.txt dic/READMEs/committers.txt dic/zipcode/README.ja
+%doc dic/ChangeLog* dic/edict_doc.txt dic/READMEs/committers.txt dic/zipcode/README.ja SKK-JISYO.wiki.20150326 
 %dir %{_datadir}/skk/
 %{_datadir}/skk/SKK-JISYO.L
 %{_datadir}/skk/skk.xpm