Accepting request 236665 from home:MargueriteSu:branches:M17N
update version 20140608 OBS-URL: https://build.opensuse.org/request/show/236665 OBS-URL: https://build.opensuse.org/package/show/M17N/ddskk?expand=0&rev=17
This commit is contained in:
Marguerite Su
Git OBS Bridge
parent
4b646a57ff
commit
2ed59e2702
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:517d155582bc4c478ad8d0e7c468ac91a7c8cc5ebf6ef0a342acf0eb66d9b231
|
||||
size 660107
|
||||
3
ddskk-20140608.tar.gz
Normal file
3
ddskk-20140608.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4ac8156b2c5baa9660061b32aca43e9145536471aa486234fdc61cd07421bcf8
|
||||
size 851375
|
||||
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 9 15:18:22 UTC 2014 - i@marguerite.su
|
||||
|
||||
- update version 20140608
|
||||
* I don't know much but just see new updates
|
||||
- drop flavor.patch
|
||||
* I don't know what's this about but upstream
|
||||
now doesn't have this code
|
||||
- drop skk-emacs-type.patch, upstreamed
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri May 30 20:37:56 UTC 2014 - jengelh@inai.de
|
||||
|
||||
|
||||
102
ddskk.spec
102
ddskk.spec
@ -16,16 +16,30 @@
|
||||
#
|
||||
|
||||
|
||||
Name: ddskk
|
||||
# Current version does not build with current xemacs, disable for now
|
||||
%define use_xemacs 0
|
||||
%define ddskkvers 14.4
|
||||
Name: ddskk
|
||||
Version: 20140608
|
||||
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
|
||||
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
|
||||
Patch2: bugzilla-141756-workaround.patch
|
||||
BuildRequires: compface
|
||||
BuildRequires: emacs-x11
|
||||
BuildRequires: flim
|
||||
BuildRequires: w3m
|
||||
BuildRequires: xorg-x11-devel
|
||||
%if %use_xemacs
|
||||
BuildRequires: xz
|
||||
%if %{use_xemacs}
|
||||
BuildRequires: flim-xemacs
|
||||
BuildRequires: semi-xemacs
|
||||
BuildRequires: xemacs-packages
|
||||
@ -34,22 +48,6 @@ Requires: apel
|
||||
Requires: emacs
|
||||
Requires: skkdic
|
||||
Provides: locale(emacs:ja)
|
||||
Version: 20121010_%{ddskkvers}
|
||||
Release: 0
|
||||
Url: http://openlab.jp/skk/index.html
|
||||
Source0: ddskk-%{ddskkvers}.tar.bz2
|
||||
Source1: suse-start.el
|
||||
Source100: skkdic-20110529.orig.tar.bz2
|
||||
# explanation for the dictionaries downloaded from:
|
||||
# http://openlab.jp/skk/wiki/wiki.cgi?page=SKK%BC%AD%BD%F1
|
||||
Source200: SKK-JISYO.wiki.bz2
|
||||
Source300: ddskk-rpmlintrc
|
||||
Patch0: flavour.patch
|
||||
Patch1: skk-emacs-type.patch
|
||||
Patch2: bugzilla-141756-workaround.patch
|
||||
Summary: SKK (Simple Kana to Kanji Conversion Program) for Emacs
|
||||
License: GPL-2.0+
|
||||
Group: Productivity/Editors/Emacs
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildArch: noarch
|
||||
|
||||
@ -58,15 +56,15 @@ SKK (Simple Kana to Kanji conversion program) is a Japanese input
|
||||
method for Emacs. ddskk (Daredevil SKK) is a version of SKK that is
|
||||
aggressively developed.
|
||||
|
||||
%if %use_xemacs
|
||||
%if %{use_xemacs}
|
||||
|
||||
%package -n ddskk-xemacs
|
||||
Summary: SKK (`Simple Kana to Kanji conversion program') for XEmacs
|
||||
Group: Productivity/Editors/Emacs
|
||||
Requires: skkdic
|
||||
Requires: xemacs
|
||||
Requires: xemacs-packages
|
||||
Provides: locale(xemacs:ja)
|
||||
Summary: SKK (`Simple Kana to Kanji conversion program') for XEmacs
|
||||
Group: Productivity/Editors/Emacs
|
||||
|
||||
%description -n ddskk-xemacs
|
||||
SKK (`Simple Kana to Kanji conversion program') is a Japanese input
|
||||
@ -76,29 +74,28 @@ aggressively developed.
|
||||
%endif
|
||||
|
||||
%package -n skkdic
|
||||
Provides: locale(scim-skk:ja)
|
||||
PreReq: info
|
||||
Url: http://openlab.jp/skk/dic.html
|
||||
Summary: Main Dictionary for SKK
|
||||
Group: System/I18n/Japanese
|
||||
Url: http://openlab.jp/skk/dic.html
|
||||
Requires(post): info
|
||||
Requires(preun): info
|
||||
Provides: locale(scim-skk:ja)
|
||||
|
||||
%description -n skkdic
|
||||
main dictionary for SKK
|
||||
|
||||
%package -n skkdic-extra
|
||||
Url: http://openlab.jp/skk/dic.html
|
||||
Summary: Optional, additional dictionaries for SKK
|
||||
Group: System/I18n/Japanese
|
||||
Url: http://openlab.jp/skk/dic.html
|
||||
|
||||
%description -n skkdic-extra
|
||||
optional, additional dictionaries for SKK
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{ddskkvers}
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%setup -q -n %{name}-%{version}
|
||||
%patch2 -p1
|
||||
tar --strip-components=1 --bzip2 -xf %{S:100} -C dic
|
||||
tar --strip-components=1 --xz -xf %{S:100} -C dic
|
||||
pushd dic
|
||||
ln -sf zipcode/SKK-JISYO.* .
|
||||
popd
|
||||
@ -115,8 +112,8 @@ grep "coding: utf-8" doc/skk.texi || exit 1
|
||||
(setq PREFIX "%{buildroot}%{_prefix}")
|
||||
(setq SKK_DATADIR "%{buildroot}%{_datadir}/skk")
|
||||
(setq SKK_INFODIR "%{buildroot}%{_infodir}")
|
||||
(setq APEL_DIR "%{buildroot}%emacs_sitelisp_dir/apel")
|
||||
(setq SKK_LISPDIR "%{buildroot}%emacs_package_dir")
|
||||
(setq APEL_DIR "%{buildroot}%{emacs_sitelisp_dir}/apel")
|
||||
(setq SKK_LISPDIR "%{buildroot}%{emacs_package_dir}")
|
||||
EOF
|
||||
export LANG=ja_JP.UTF-8
|
||||
make EMACS=emacs %{?_smp_mflags}
|
||||
@ -134,7 +131,7 @@ cat %{_sourcedir}/suse-start.el >> %{buildroot}%{emacs_sitelisp_dir}/suse-start-
|
||||
;; %{emacs_sitelisp_dir}/suse-start-%{name}.el ends here
|
||||
EOF
|
||||
######################################################################
|
||||
%if %use_xemacs
|
||||
%if %{use_xemacs}
|
||||
# now build for XEmacs:
|
||||
%define xemacs_package_dir %{_datadir}/xemacs/site-packages/
|
||||
make clean
|
||||
@ -142,43 +139,35 @@ sed -ri 's@\(setq[[:blank:]].*\)@@' SKK-CFG
|
||||
(cat >> SKK-CFG)<<-'EOF'
|
||||
(setq PREFIX "%{buildroot}%{_prefix}")
|
||||
(setq SKK_DATADIR "%{buildroot}%{_datadir}/skk")
|
||||
(setq SKK_INFODIR "%{buildroot}%xemacs_package_dir/info")
|
||||
(setq APEL_DIR "%{buildroot}%xemacs_package_dir/lisp/apel")
|
||||
(setq SKK_LISPDIR "%{buildroot}%xemacs_package_dir/lisp/skk")
|
||||
(setq PACKAGEDIR "%{buildroot}%xemacs_package_dir")
|
||||
(setq SKK_INFODIR "%{buildroot}%{xemacs_package_dir}/info")
|
||||
(setq APEL_DIR "%{buildroot}%{xemacs_package_dir}/lisp/apel")
|
||||
(setq SKK_LISPDIR "%{buildroot}%{xemacs_package_dir}/lisp/skk")
|
||||
(setq PACKAGEDIR "%{buildroot}%{xemacs_package_dir}")
|
||||
EOF
|
||||
make EMACS=xemacs %{?_smp_mflags}
|
||||
make EMACS=xemacs install-package
|
||||
gzip %{buildroot}%{xemacs_package_dir}/info/skk*.info*
|
||||
# I would be wasteful if XEmacs had it's own copy of the dictionaries
|
||||
|
||||
# It would be wasteful if XEmacs had it's own copy of the dictionaries
|
||||
# and some other files. The whole %{xemacs_package_dir}/etc/skk
|
||||
# can be shared with Emacs.
|
||||
rm -rf %{buildroot}%{xemacs_package_dir}/etc/skk
|
||||
ln -s %{_datadir}/skk %{buildroot}%{xemacs_package_dir}/etc/skk
|
||||
rm -rf %{buildroot}%{xemacs_package_dir}%{_sysconfdir}/skk
|
||||
ln -s %{_datadir}/skk %{buildroot}%{xemacs_package_dir}%{_sysconfdir}/skk
|
||||
# the info pages are in the skkdic package to be able to share them
|
||||
# for Emacs and XEmacs:
|
||||
rm -f %{buildroot}%{xemacs_package_dir}/info/skk*
|
||||
# replace buildroot in comments in .elc files by spaces with the same total length:
|
||||
RPM_BUILD_ROOT_REPLACEMENT=$(echo "%{buildroot}" | tr [:print:] ' ')
|
||||
RPM_BUILD_ROOT_REPLACEMENT=$(echo %{buildroot} | tr [:print:] ' ')
|
||||
for i in $(find %{buildroot} -name "*.elc")
|
||||
do
|
||||
perl -pi -e "s|(;;; from file )%{buildroot}(%{_datadir}/xemacs/site-packages/.*)|\1%{buildroot}\2|" $i
|
||||
done
|
||||
%endif
|
||||
# remove buildroot in .el files:
|
||||
# for i in $(find %{buildroot} -name "*.el")
|
||||
# do
|
||||
# perl -pi -e "s|%{buildroot}||" $i
|
||||
# # touch the .elc files again because they are still up to date:
|
||||
# if -f ${i}c
|
||||
# then
|
||||
# touch ${i}c
|
||||
# fi
|
||||
# done
|
||||
# remove buildroot in .el files
|
||||
perl -pi -e "s|%{buildroot}||" %{buildroot}%{emacs_package_dir}/skk-setup.el
|
||||
|
||||
rm -vf %{buildroot}%{_infodir}/dir
|
||||
%if %use_xemacs
|
||||
%if %{use_xemacs}
|
||||
rm -vf %{buildroot}%{xemacs_package_dir}/info/dir
|
||||
%endif
|
||||
mv READMEs/INSTALL .
|
||||
@ -197,20 +186,21 @@ fi
|
||||
%{emacs_package_dir}
|
||||
%config %{emacs_sitelisp_dir}/suse-start-%{name}.el
|
||||
%{_infodir}/*
|
||||
%if %use_xemacs
|
||||
|
||||
%if %{use_xemacs}
|
||||
%files -n ddskk-xemacs
|
||||
%defattr(-,root,root)
|
||||
%doc ChangeLog* READMEs
|
||||
%dir %{xemacs_package_dir}/
|
||||
%dir %{xemacs_package_dir}/lisp/
|
||||
%dir %{xemacs_package_dir}/etc/
|
||||
%dir %{xemacs_package_dir}%{_sysconfdir}/
|
||||
%{xemacs_package_dir}/lisp/*
|
||||
%{xemacs_package_dir}/etc/*
|
||||
%{xemacs_package_dir}%{_sysconfdir}/*
|
||||
%endif
|
||||
|
||||
%files -n skkdic
|
||||
%defattr(-,root,root)
|
||||
%doc dic/ChangeLog* dic/edict_doc.txt dic/READMEs/committers.txt dic/zipcode/README.ja
|
||||
%dir %{_datadir}/skk/
|
||||
%{_datadir}/skk/SKK-JISYO.L
|
||||
%{_datadir}/skk/skk.xpm
|
||||
@ -230,6 +220,8 @@ fi
|
||||
%{_datadir}/skk/SKK-JISYO.S
|
||||
%{_datadir}/skk/SKK-JISYO.JIS2004
|
||||
%{_datadir}/skk/SKK-JISYO.assoc
|
||||
%{_datadir}/skk/SKK-JISYO.china_taiwan
|
||||
%{_datadir}/skk/SKK-JISYO.edict
|
||||
%{_datadir}/skk/SKK-JISYO.fullname
|
||||
%{_datadir}/skk/SKK-JISYO.geo
|
||||
%{_datadir}/skk/SKK-JISYO.itaiji
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
--- ddskk-14.4/skk-emacs.el
|
||||
+++ ddskk-14.4/skk-emacs.el 2012-07-04 13:30:22.168010235 +0000
|
||||
@@ -497,7 +497,7 @@
|
||||
text-width text-height
|
||||
screen-width screen-height
|
||||
(inhibit-quit t)
|
||||
- (tooltip-use-echo-area nil))
|
||||
+ (tooltip-mode nil))
|
||||
;;
|
||||
(when (null (car P))
|
||||
(unless (memq skk-tooltip-mouse-behavior '(avoid-maybe banish nil))
|
||||
@ -1,45 +0,0 @@
|
||||
Description: Don't use the abolished variable `skk-emacs-type'
|
||||
Author: Tatsuya Kinoshita <tats@vega.ocn.ne.jp>
|
||||
|
||||
2012-01-04 Tatsuya Kinoshita <tats@vega.ocn.ne.jp>
|
||||
|
||||
* experimental/skk-exserv.el, experimental/skk-w3m.el,
|
||||
experimental/rdbms/skk-rdbms.el: Don't use `skk-emacs-type'.
|
||||
|
||||
--- ddskk-14.4.orig/experimental/rdbms/skk-rdbms.el 2010-08-03 00:21:06.000000000 +0900
|
||||
+++ ddskk-14.4/experimental/rdbms/skk-rdbms.el 2012-01-04 00:26:21.000000000 +0900
|
||||
@@ -475,7 +475,7 @@
|
||||
skk-rdbms-shell
|
||||
skk-rdbms-shell-args))
|
||||
(process-kill-without-query skk-rdbms-process)
|
||||
- (cond ((eq skk-emacs-type 'xemacs)
|
||||
+ (cond ((featurep 'xemacs)
|
||||
(set-process-input-coding-system
|
||||
skk-rdbms-process
|
||||
skk-rdbms-process-coding-system)
|
||||
--- ddskk-14.4.orig/experimental/skk-exserv.el 2010-08-03 00:21:05.000000000 +0900
|
||||
+++ ddskk-14.4/experimental/skk-exserv.el 2012-01-04 00:25:07.000000000 +0900
|
||||
@@ -116,11 +116,9 @@
|
||||
nil
|
||||
(process-kill-without-query process)
|
||||
(static-cond
|
||||
- ((eq skk-emacs-type 'xemacs)
|
||||
+ ((featurep 'xemacs)
|
||||
(set-process-input-coding-system process coding-system)
|
||||
(set-process-output-coding-system process coding-system))
|
||||
- ((eq skk-emacs-type 'nemacs)
|
||||
- (set-process-kanji-code process 0))
|
||||
(t
|
||||
(set-process-coding-system process coding-system coding-system)))
|
||||
(oset engine process process)
|
||||
--- ddskk-14.4.orig/experimental/skk-w3m.el 2010-08-03 00:21:05.000000000 +0900
|
||||
+++ ddskk-14.4/experimental/skk-w3m.el 2012-01-04 00:26:02.000000000 +0900
|
||||
@@ -314,7 +314,7 @@
|
||||
|
||||
(defun skk-w3m-set-process-coding-system (coding-system)
|
||||
(static-cond
|
||||
- ((eq skk-emacs-type 'xemacs)
|
||||
+ ((featurep 'xemacs)
|
||||
(set-process-input-coding-system skk-w3m-process coding-system)
|
||||
(set-process-output-coding-system skk-w3m-process coding-system))
|
||||
(t
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:272e305d0096e224792204b90b06454f0709d21eb9543ed9abfac381c714d47a
|
||||
size 7606429
|
||||
3
skkdic-20140609.tar.xz
Normal file
3
skkdic-20140609.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:18da82eecae01b7758ee1b8e9c013e90ad42535c6a1afe193663576b45578e26
|
||||
size 6094028
|
||||
Loading…
Reference in New Issue
Block a user