From 62e9faf1d56c04b79c3623c13a242703e071ad0986b02c6a574a78d6325caa29 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Wed, 4 Jul 2012 13:37:18 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/M17N/ddskk?expand=0&rev=11 --- SKK-JISYO.JIS2.bz2 | 3 - SKK-JISYO.JIS3_4.bz2 | 3 - SKK-JISYO.L.bz2 | 3 - SKK-JISYO.M.bz2 | 3 - SKK-JISYO.ML.bz2 | 3 - SKK-JISYO.S.bz2 | 3 - SKK-JISYO.assoc.bz2 | 3 - SKK-JISYO.china_taiwan.bz2 | 3 - SKK-JISYO.edict.tar.bz2 | 3 - SKK-JISYO.fukugo.bz2 | 3 - SKK-JISYO.geo.bz2 | 3 - SKK-JISYO.jinmei.bz2 | 3 - SKK-JISYO.law.bz2 | 3 - SKK-JISYO.mazegaki.bz2 | 3 - SKK-JISYO.okinawa.bz2 | 3 - SKK-JISYO.pubdic+.bz2 | 3 - SKK-JISYO.wrong.annotated.bz2 | 3 - bugzilla-141756-workaround.patch | 13 +- ddskk-14.4.tar.bz2 | 3 + ddskk-20050123.tar.bz2 | 3 - ddskk-rpmlintrc | 2 + ddskk.changes | 9 ++ ddskk.spec | 201 ++++++++++++++-------------- fix-build-for-xemacs.patch | 19 --- flavour.patch | 11 ++ skk-emacs-type.patch | 45 +++++++ skk-texinfo-illegal-character.patch | 13 -- skkdic-20110529.orig.tar.bz2 | 3 + zipcode.tar.bz2 | 3 - 29 files changed, 176 insertions(+), 200 deletions(-) delete mode 100644 SKK-JISYO.JIS2.bz2 delete mode 100644 SKK-JISYO.JIS3_4.bz2 delete mode 100644 SKK-JISYO.L.bz2 delete mode 100644 SKK-JISYO.M.bz2 delete mode 100644 SKK-JISYO.ML.bz2 delete mode 100644 SKK-JISYO.S.bz2 delete mode 100644 SKK-JISYO.assoc.bz2 delete mode 100644 SKK-JISYO.china_taiwan.bz2 delete mode 100644 SKK-JISYO.edict.tar.bz2 delete mode 100644 SKK-JISYO.fukugo.bz2 delete mode 100644 SKK-JISYO.geo.bz2 delete mode 100644 SKK-JISYO.jinmei.bz2 delete mode 100644 SKK-JISYO.law.bz2 delete mode 100644 SKK-JISYO.mazegaki.bz2 delete mode 100644 SKK-JISYO.okinawa.bz2 delete mode 100644 SKK-JISYO.pubdic+.bz2 delete mode 100644 SKK-JISYO.wrong.annotated.bz2 create mode 100644 ddskk-14.4.tar.bz2 delete mode 100644 ddskk-20050123.tar.bz2 create mode 100644 ddskk-rpmlintrc delete mode 100644 fix-build-for-xemacs.patch create mode 100644 flavour.patch create mode 100644 skk-emacs-type.patch delete mode 100644 skk-texinfo-illegal-character.patch create mode 100644 skkdic-20110529.orig.tar.bz2 delete mode 100644 zipcode.tar.bz2 diff --git a/SKK-JISYO.JIS2.bz2 b/SKK-JISYO.JIS2.bz2 deleted file mode 100644 index 4c2c458..0000000 --- a/SKK-JISYO.JIS2.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:db2187dd61dab191e4d24f3fc03818b0e4efd6085efa1aa282ec61141b8c1a28 -size 5338 diff --git a/SKK-JISYO.JIS3_4.bz2 b/SKK-JISYO.JIS3_4.bz2 deleted file mode 100644 index 0b31982..0000000 --- a/SKK-JISYO.JIS3_4.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:34be62c9d443dc99a59bf604a84d081a3da45837588f2b45a5621527b21d1d18 -size 30576 diff --git a/SKK-JISYO.L.bz2 b/SKK-JISYO.L.bz2 deleted file mode 100644 index f475b0c..0000000 --- a/SKK-JISYO.L.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2aa3cf320e0bd3f4109295cab4d3a2fd10bae3ce558de9f043f831ca4cf2a0ef -size 1432322 diff --git a/SKK-JISYO.M.bz2 b/SKK-JISYO.M.bz2 deleted file mode 100644 index 041912e..0000000 --- a/SKK-JISYO.M.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a7ee739ac992824b54f41e6a3bd6b8088d66e2c643909a5d0dfdfb50139a6de7 -size 62542 diff --git a/SKK-JISYO.ML.bz2 b/SKK-JISYO.ML.bz2 deleted file mode 100644 index 2e1f769..0000000 --- a/SKK-JISYO.ML.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6cdb8691eed29e39b8c28c365a7677dd79a326c7caef0dd3a8a7267dd2ed51bf -size 400849 diff --git a/SKK-JISYO.S.bz2 b/SKK-JISYO.S.bz2 deleted file mode 100644 index 67661c2..0000000 --- a/SKK-JISYO.S.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ce6f4acf8dd0003f32784c8880a4bd816d9e59ef9aa84770e36c27f644f33238 -size 25955 diff --git a/SKK-JISYO.assoc.bz2 b/SKK-JISYO.assoc.bz2 deleted file mode 100644 index 695c836..0000000 --- a/SKK-JISYO.assoc.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d641eedcade4e4fb91390d6b8f4b2c293426780c1c67fbee6e2a40d38dba0499 -size 5831 diff --git a/SKK-JISYO.china_taiwan.bz2 b/SKK-JISYO.china_taiwan.bz2 deleted file mode 100644 index e50785f..0000000 --- a/SKK-JISYO.china_taiwan.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:37179a6291a2977d8e851bfe9d17972cde993fde877c9d5abc698ce745eed800 -size 2475 diff --git a/SKK-JISYO.edict.tar.bz2 b/SKK-JISYO.edict.tar.bz2 deleted file mode 100644 index 561b226..0000000 --- a/SKK-JISYO.edict.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:811e6c3a0d500f122990e8077dd24cd585f4bc4887c24d64597980603267ed08 -size 228888 diff --git a/SKK-JISYO.fukugo.bz2 b/SKK-JISYO.fukugo.bz2 deleted file mode 100644 index 10d4662..0000000 --- a/SKK-JISYO.fukugo.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f695abb5b3bea46567c55b240bab01082a463a3b90540c455e3d1da90baf6e78 -size 1577 diff --git a/SKK-JISYO.geo.bz2 b/SKK-JISYO.geo.bz2 deleted file mode 100644 index f3d793a..0000000 --- a/SKK-JISYO.geo.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9ffa080d04b64442f0c5427b20e95fe3a95d855784fe52a43a06182aa48ecf26 -size 535933 diff --git a/SKK-JISYO.jinmei.bz2 b/SKK-JISYO.jinmei.bz2 deleted file mode 100644 index f76deae..0000000 --- a/SKK-JISYO.jinmei.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3fd075366350f343096d0761691035d05ca3422cfac7991aea048e5b45a62317 -size 192850 diff --git a/SKK-JISYO.law.bz2 b/SKK-JISYO.law.bz2 deleted file mode 100644 index 268dac5..0000000 --- a/SKK-JISYO.law.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:312d993fb4fa8c4640bec9a0d87cb9cbd0c2826741bc054fd95563450af8d6bc -size 113767 diff --git a/SKK-JISYO.mazegaki.bz2 b/SKK-JISYO.mazegaki.bz2 deleted file mode 100644 index 3b85e13..0000000 --- a/SKK-JISYO.mazegaki.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f4286c177d7a81f9f60029e2f8f560db4dd15e1b5faca57707f8e2ad38814936 -size 23101 diff --git a/SKK-JISYO.okinawa.bz2 b/SKK-JISYO.okinawa.bz2 deleted file mode 100644 index 64b7bfb..0000000 --- a/SKK-JISYO.okinawa.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:156314f4ff8edbb5cc0b15500ea2ab33c1b54e4134a394cfa6670b427d19d224 -size 15489 diff --git a/SKK-JISYO.pubdic+.bz2 b/SKK-JISYO.pubdic+.bz2 deleted file mode 100644 index 23533a0..0000000 --- a/SKK-JISYO.pubdic+.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2cdb6fa2fd033e5950d6a86527cfdbafd02494967145b34f8bd4c418159667de -size 3507 diff --git a/SKK-JISYO.wrong.annotated.bz2 b/SKK-JISYO.wrong.annotated.bz2 deleted file mode 100644 index 8fc9a9b..0000000 --- a/SKK-JISYO.wrong.annotated.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b85c4c76d9476ed20f6c32b19580cb6b8d9c9c6580c4eaa450e29b3c1cf6bde1 -size 26369 diff --git a/bugzilla-141756-workaround.patch b/bugzilla-141756-workaround.patch index 6a4ace6..b469119 100644 --- a/bugzilla-141756-workaround.patch +++ b/bugzilla-141756-workaround.patch @@ -1,18 +1,17 @@ -diff -ru ddskk-20050123.orig/SKK-MK ddskk-20050123/SKK-MK ---- ddskk-20050123.orig/SKK-MK 2004-04-17 02:06:03.000000000 +0200 -+++ ddskk-20050123/SKK-MK 2006-01-10 16:48:17.000000000 +0100 -@@ -45,7 +45,13 @@ +--- ddskk-14.4/SKK-MK ++++ ddskk-14.4/SKK-MK 2012-07-04 11:57:27.140510120 +0000 +@@ -44,7 +44,13 @@ Please install Daredevil SKK 13.1 or 14. (error "%s" "\ This version of SKK requires MULE features")) -(set-language-environment "Japanese") +(if (and (featurep 'xemacs) + (emacs-version>= 21 5 6) -+ (getenv "LANG")) ++ (getenv "LANG")) + (let ((old-lang (getenv "LANG"))) + (set-language-environment "Japanese") + (setenv "LANG" old-lang)) + (set-language-environment "Japanese")) - ;;;; User variables to control SKK-MK. - (defvar SKK-MK-debugging nil "*Non-nil means making verbose output.") + ;; Variables. + diff --git a/ddskk-14.4.tar.bz2 b/ddskk-14.4.tar.bz2 new file mode 100644 index 0000000..6c12a26 --- /dev/null +++ b/ddskk-14.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:517d155582bc4c478ad8d0e7c468ac91a7c8cc5ebf6ef0a342acf0eb66d9b231 +size 660107 diff --git a/ddskk-20050123.tar.bz2 b/ddskk-20050123.tar.bz2 deleted file mode 100644 index 4aa9fca..0000000 --- a/ddskk-20050123.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:008d9ed425b51f9aea309578c04159f8fbfcc955734fd16d326c6cf16d9abaa5 -size 538664 diff --git a/ddskk-rpmlintrc b/ddskk-rpmlintrc new file mode 100644 index 0000000..c52f915 --- /dev/null +++ b/ddskk-rpmlintrc @@ -0,0 +1,2 @@ +addFilter(".*rpm-buildroot-usage.") +addFilter(".*macro-in-comment.") diff --git a/ddskk.changes b/ddskk.changes index d636e17..ee07961 100644 --- a/ddskk.changes +++ b/ddskk.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Jul 4 13:34:18 UTC 2012 - werner@suse.de + +- Update to ddskk-14.4 and skkdic-20110529 + * Don't know to much as I do not speak nor read Japanese but + it compiles with latest emacs 24.1 +- Take some patches from Debian as well add some own patches +- Drop superfluous patches + ------------------------------------------------------------------- Fri Jan 6 15:33:15 UTC 2012 - pgajdos@suse.com diff --git a/ddskk.spec b/ddskk.spec index 46fc2ee..ba67979 100644 --- a/ddskk.spec +++ b/ddskk.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: ddskk # Current version does not build with current xemacs, disable for now %define use_xemacs 0 @@ -33,36 +34,22 @@ BuildRequires: flim-xemacs BuildRequires: semi-xemacs BuildRequires: xemacs-packages %endif -Requires: emacs, apel, skkdic +Requires: apel +Requires: emacs +Requires: skkdic Provides: locale(emacs:ja) -Version: 20050123 +Version: 14.4 Release: 0 Url: http://openlab.jp/skk/index.html -Source0: http://openlab.jp/skk/maintrunk/ddskk-20050123.tar.bz2 +Source0: ddskk-%{version}.tar.bz2 Source1: suse-start.el -Source100: http://openlab.jp/skk/dic/SKK-JISYO.L.bz2 -Source101: http://openlab.jp/skk/dic/SKK-JISYO.M.bz2 -Source102: http://openlab.jp/skk/dic/SKK-JISYO.ML.bz2 -Source103: http://openlab.jp/skk/dic/SKK-JISYO.S.bz2 -Source104: http://openlab.jp/skk/dic/SKK-JISYO.JIS2.bz2 -Source105: http://openlab.jp/skk/dic/SKK-JISYO.JIS3_4.bz2 -Source106: http://openlab.jp/skk/dic/SKK-JISYO.wrong.annotated.bz2 -Source107: http://openlab.jp/skk/dic/SKK-JISYO.pubdic+.bz2 -Source108: http://openlab.jp/skk/dic/SKK-JISYO.edict.tar.bz2 -Source109: http://openlab.jp/skk/dic/SKK-JISYO.geo.bz2 -Source110: http://openlab.jp/skk/dic/zipcode.tar.bz2 -Source111: http://openlab.jp/skk/dic/SKK-JISYO.assoc.bz2 -Source112: http://openlab.jp/skk/dic/SKK-JISYO.okinawa.bz2 -Source113: http://openlab.jp/skk/dic/SKK-JISYO.law.bz2 -Source114: http://openlab.jp/skk/dic/SKK-JISYO.jinmei.bz2 -Source115: http://openlab.jp/skk/dic/SKK-JISYO.china_taiwan.bz2 -Source116: http://openlab.jp/skk/dic/SKK-JISYO.mazegaki.bz2 -Source117: http://openlab.jp/skk/dic/SKK-JISYO.fukugo.bz2 +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 -Patch0: fix-build-for-xemacs.patch -Patch1: skk-texinfo-illegal-character.patch +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+ @@ -78,7 +65,9 @@ aggressively developed. %if %use_xemacs %package -n ddskk-xemacs -Requires: xemacs, xemacs-packages, skkdic +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 @@ -102,7 +91,7 @@ main dictionary for SKK %package -n skkdic-extra Url: http://openlab.jp/skk/dic.html -Summary: optional, additional dictionaries for SKK +Summary: Optional, additional dictionaries for SKK Group: System/I18n/Japanese %description -n skkdic-extra @@ -113,9 +102,10 @@ optional, additional dictionaries for SKK %patch0 -p1 %patch1 -p1 %patch2 -p1 -tar jxf $RPM_SOURCE_DIR/zipcode.tar.bz2 -cp $RPM_SOURCE_DIR/SKK-JISYO*bz2 zipcode/SKK-JISYO* dic -bunzip2 dic/*bz2 +tar --strip-components=1 --bzip2 -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 @@ -125,95 +115,85 @@ grep "coding: utf-8" doc/skk.texi || exit 1 %build %define emacs_sitelisp_dir %{_datadir}/emacs/site-lisp %define emacs_package_dir %{emacs_sitelisp_dir}/skk +(cat >> SKK-CFG)<<-'EOF' + (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") + EOF export LANG=ja_JP.UTF-8 -make PREFIX=$RPM_BUILD_ROOT/usr \ - SKK_DATADIR=$RPM_BUILD_ROOT/usr/share/skk \ - SKK_INFODIR=$RPM_BUILD_ROOT/usr/share/info \ - APEL_SPECIFIC_LISPDIR=$RPM_BUILD_ROOT%emacs_sitelisp_dir/apel \ - SKK_LISPDIR=$RPM_BUILD_ROOT%emacs_package_dir \ - EMACS=emacs %{?_smp_mflags} +make EMACS=emacs %{?_smp_mflags} %install export LANG=ja_JP.UTF-8 -mkdir -p $RPM_BUILD_ROOT%{emacs_package_dir} -make PREFIX=$RPM_BUILD_ROOT/usr \ - SKK_DATADIR=$RPM_BUILD_ROOT/usr/share/skk \ - SKK_INFODIR=$RPM_BUILD_ROOT/usr/share/info \ - APEL_SPECIFIC_LISPDIR=$RPM_BUILD_ROOT%emacs_sitelisp_dir/apel \ - SKK_LISPDIR=$RPM_BUILD_ROOT%emacs_package_dir \ - EMACS=emacs \ - install -{ - echo ";; %{emacs_sitelisp_dir}/suse-start-%{name}.el" - echo "" - echo "(add-to-list 'load-path \"%{emacs_package_dir}\")" - echo "" - cat $RPM_SOURCE_DIR/suse-start.el - echo "" - echo ";; %{emacs_sitelisp_dir}/suse-start-%{name}.el ends here" -} > %{buildroot}%{emacs_sitelisp_dir}/suse-start-%{name}.el +mkdir -p %{buildroot}%{emacs_package_dir} +make EMACS=emacs install +(cat > %{buildroot}%{emacs_sitelisp_dir}/suse-start-%{name}.el)<<-'EOF' + ;; %{emacs_sitelisp_dir}/suse-start-%{name}.el + (add-to-list 'load-path "%{emacs_package_dir}") + EOF +cat %{_sourcedir}/suse-start.el >> %{buildroot}%{emacs_sitelisp_dir}/suse-start-%{name}.el +(cat >> %{buildroot}%{emacs_sitelisp_dir}/suse-start-%{name}.el)<<-'EOF' + ;; %{emacs_sitelisp_dir}/suse-start-%{name}.el ends here + EOF ###################################################################### %if %use_xemacs # now build for XEmacs: -%define xemacs_package_dir /usr/share/xemacs/site-packages/ +%define xemacs_package_dir %{_datadir}/xemacs/site-packages/ make clean -make PREFIX=$RPM_BUILD_ROOT/usr \ - SKK_DATADIR=$RPM_BUILD_ROOT/usr/share/skk \ - SKK_INFODIR=$RPM_BUILD_ROOT%xemacs_package_dir/info \ - APEL_SPECIFIC_LISPDIR=$RPM_BUILD_ROOT%xemacs_package_dir/lisp/apel \ - SKK_LISPDIR=$RPM_BUILD_ROOT%xemacs_package_dir/lisp/skk \ - PACKAGEDIR=$RPM_BUILD_ROOT%xemacs_package_dir \ - EMACS=xemacs %{?_smp_mflags} -make PREFIX=$RPM_BUILD_ROOT/usr \ - SKK_DATADIR=$RPM_BUILD_ROOT/usr/share/skk \ - SKK_INFODIR=$RPM_BUILD_ROOT%xemacs_package_dir/info \ - APEL_SPECIFIC_LISPDIR=$RPM_BUILD_ROOT%xemacs_package_dir/lisp/apel \ - SKK_LISPDIR=$RPM_BUILD_ROOT%xemacs_package_dir/lisp/skk \ - PACKAGEDIR=$RPM_BUILD_ROOT%xemacs_package_dir \ - EMACS=xemacs \ - install-package -gzip $RPM_BUILD_ROOT%{xemacs_package_dir}/info/skk*.info* +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") + 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 # and some other files. The whole %{xemacs_package_dir}/etc/skk # can be shared with Emacs. -rm -rf $RPM_BUILD_ROOT%{xemacs_package_dir}/etc/skk -ln -s /usr/share/skk $RPM_BUILD_ROOT%{xemacs_package_dir}/etc/skk +rm -rf %{buildroot}%{xemacs_package_dir}/etc/skk +ln -s %{_datadir}/skk %{buildroot}%{xemacs_package_dir}/etc/skk # the info pages are in the skkdic package to be able to share them # for Emacs and XEmacs: -rm -f $RPM_BUILD_ROOT%{xemacs_package_dir}/info/skk* +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 "$RPM_BUILD_ROOT" | tr [:print:] ' ') -for i in $(find $RPM_BUILD_ROOT -name "*.elc") +RPM_BUILD_ROOT_REPLACEMENT=$(echo "%{buildroot}" | tr [:print:] ' ') +for i in $(find %{buildroot} -name "*.elc") do - perl -pi -e "s|(;;; from file )$RPM_BUILD_ROOT(/usr/share/xemacs/site-packages/.*)|\1$RPM_BUILD_ROOT_REPLACEMENT\2|" $i + 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 $RPM_BUILD_ROOT -name "*.el") +# for i in $(find %{buildroot} -name "*.el") # do -# perl -pi -e "s|$RPM_BUILD_ROOT||" $i +# 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 -perl -pi -e "s|$RPM_BUILD_ROOT||" $RPM_BUILD_ROOT%{emacs_package_dir}/skk-setup.el +perl -pi -e "s|%{buildroot}||" %{buildroot}%{emacs_package_dir}/skk-setup.el -rm -f $RPM_BUILD_ROOT/%{_infodir}/dir -rm -f $RPM_BUILD_ROOT/%{xemacs_package_dir}/info/dir +rm -vf %{buildroot}%{_infodir}/dir +%if %use_xemacs +rm -vf %{buildroot}%{xemacs_package_dir}/info/dir +%endif +mv READMEs/INSTALL . -%post -n skkdic -for i in skk -do - %install_info --info-dir=%{_infodir} %{_infodir}/${i}.info.gz -done +%post +%install_info --info-dir=%{_infodir} %{_infodir}/skk.info -%preun -n skkdic -for i in skk -do - %install_info --delete --info-dir=%{_infodir} %{_infodir}/${i}.info.gz -done +%preun +if test $1 = 0; then + %install_info_delete --info-dir=%{_infodir} %{_infodir}/skk.info +fi %files %defattr(-,root,root) @@ -235,23 +215,36 @@ done %files -n skkdic %defattr(-,root,root) -%dir /usr/share/skk/ -/usr/share/skk/SKK-JISYO.L -/usr/share/skk/skk.xpm -/usr/share/skk/SKK.tut -/usr/share/skk/SKK.tut.E +%dir %{_datadir}/skk/ +%{_datadir}/skk/SKK-JISYO.L +%{_datadir}/skk/skk.xpm +%{_datadir}/skk/SKK.tut +%{_datadir}/skk/SKK.tut.E %files -n skkdic-extra %defattr(-,root,root) -%dir /usr/share/skk/ -/usr/share/skk/SKK-JISYO.ML -/usr/share/skk/SKK-JISYO.M -/usr/share/skk/SKK-JISYO.zipcode -/usr/share/skk/SKK-JISYO.office.zipcode -/usr/share/skk/SKK-JISYO.pubdic+ -/usr/share/skk/SKK-JISYO.JIS3_4 -/usr/share/skk/SKK-JISYO.JIS2 -/usr/share/skk/SKK-JISYO.S -/usr/share/skk/NICOLA-SKK.tut +%dir %{_datadir}/skk/ +%{_datadir}/skk/SKK-JISYO.ML +%{_datadir}/skk/SKK-JISYO.M +%{_datadir}/skk/SKK-JISYO.zipcode +%{_datadir}/skk/SKK-JISYO.office.zipcode +%{_datadir}/skk/SKK-JISYO.pubdic+ +%{_datadir}/skk/SKK-JISYO.JIS3_4 +%{_datadir}/skk/SKK-JISYO.JIS2 +%{_datadir}/skk/SKK-JISYO.S +%{_datadir}/skk/SKK-JISYO.JIS2004 +%{_datadir}/skk/SKK-JISYO.assoc +%{_datadir}/skk/SKK-JISYO.fullname +%{_datadir}/skk/SKK-JISYO.geo +%{_datadir}/skk/SKK-JISYO.itaiji +%{_datadir}/skk/SKK-JISYO.itaiji.JIS3_4 +%{_datadir}/skk/SKK-JISYO.jinmei +%{_datadir}/skk/SKK-JISYO.law +%{_datadir}/skk/SKK-JISYO.mazegaki +%{_datadir}/skk/SKK-JISYO.okinawa +%{_datadir}/skk/SKK-JISYO.propernoun +%{_datadir}/skk/SKK-JISYO.requested +%{_datadir}/skk/SKK-JISYO.station +%{_datadir}/skk/NICOLA-SKK.tut %changelog diff --git a/fix-build-for-xemacs.patch b/fix-build-for-xemacs.patch deleted file mode 100644 index d3e1ef2..0000000 --- a/fix-build-for-xemacs.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -ru ddskk-20050123.orig/SKK-MK ddskk-20050123/SKK-MK ---- ddskk-20050123.orig/SKK-MK 2004-04-17 02:06:03.000000000 +0200 -+++ ddskk-20050123/SKK-MK 2005-01-26 17:18:03.583508283 +0100 -@@ -1019,10 +1019,13 @@ - (let ((generated-autoload-file - (expand-file-name "auto-autoloads.el"))) - (setq buffer-file-name generated-autoload-file) -- (fixup-autoload-buffer "skk-autoloads") -+ ;; (fixup-autoload-buffer "skk-autoloads") - (goto-char (point-max)) - (unless (bolp) - (insert "\n")) -+ (insert "(provide 'skk-autoloads) -+;;; skk-autoloads.el ends here -+") - (write-region-as-coding-system 'iso-2022-jp - (point-min) - (point-max) - diff --git a/flavour.patch b/flavour.patch new file mode 100644 index 0000000..3d65023 --- /dev/null +++ b/flavour.patch @@ -0,0 +1,11 @@ +--- 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)) diff --git a/skk-emacs-type.patch b/skk-emacs-type.patch new file mode 100644 index 0000000..1f29f1e --- /dev/null +++ b/skk-emacs-type.patch @@ -0,0 +1,45 @@ +Description: Don't use the abolished variable `skk-emacs-type' +Author: Tatsuya Kinoshita + +2012-01-04 Tatsuya Kinoshita + + * 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 diff --git a/skk-texinfo-illegal-character.patch b/skk-texinfo-illegal-character.patch deleted file mode 100644 index 833ac0b..0000000 --- a/skk-texinfo-illegal-character.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ru ddskk-20050123.orig/doc/skk.texi ddskk-20050123/doc/skk.texi ---- ddskk-20050123.orig/doc/skk.texi 2004-09-04 12:01:11.000000000 +0200 -+++ ddskk-20050123/doc/skk.texi 2005-01-27 15:54:41.876664737 +0100 -@@ -4612,7 +4612,7 @@ - - @example - @group --A:$B!!(B S:$B!1(B D:$B!A(B F:$B!Q(B G:$B!a(B H:$B!q(B Q:$B"!(B W:$B"1(B E:$B"A(B R:$B"Q(B T:$B"a(B Y:$B"q(B -+A:$B!!(B S:$B!1(B D:$B!A(B F:$B!Q(B G:$B!a(B H:$B!q(B Q:$B"!(B W:? E:$B"A(B R:? T:$B"a(B Y:? - @end group - @end example - - diff --git a/skkdic-20110529.orig.tar.bz2 b/skkdic-20110529.orig.tar.bz2 new file mode 100644 index 0000000..07d4664 --- /dev/null +++ b/skkdic-20110529.orig.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:272e305d0096e224792204b90b06454f0709d21eb9543ed9abfac381c714d47a +size 7606429 diff --git a/zipcode.tar.bz2 b/zipcode.tar.bz2 deleted file mode 100644 index f4edc44..0000000 --- a/zipcode.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:49e09f1a3ea00913a1b7234e3dc1ddc9ceeb3edbcdade8383b643074d4bbdcf9 -size 1565024