Hello community, here is the log from the commit of package ddskk for openSUSE:Factory checked in at 2012-07-06 09:26:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ddskk (Old) and /work/SRC/openSUSE:Factory/.ddskk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ddskk", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/ddskk/ddskk.changes 2012-01-09 15:16:14.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ddskk.new/ddskk.changes 2012-07-06 09:26:41.000000000 +0200 @@ -1,0 +2,9 @@ +Wed Jul 4 13:34:18 UTC 2012 - [email protected] + +- 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 + +------------------------------------------------------------------- Old: ---- SKK-JISYO.JIS2.bz2 SKK-JISYO.JIS3_4.bz2 SKK-JISYO.L.bz2 SKK-JISYO.M.bz2 SKK-JISYO.ML.bz2 SKK-JISYO.S.bz2 SKK-JISYO.assoc.bz2 SKK-JISYO.china_taiwan.bz2 SKK-JISYO.edict.tar.bz2 SKK-JISYO.fukugo.bz2 SKK-JISYO.geo.bz2 SKK-JISYO.jinmei.bz2 SKK-JISYO.law.bz2 SKK-JISYO.mazegaki.bz2 SKK-JISYO.okinawa.bz2 SKK-JISYO.pubdic+.bz2 SKK-JISYO.wrong.annotated.bz2 ddskk-20050123.tar.bz2 fix-build-for-xemacs.patch skk-texinfo-illegal-character.patch zipcode.tar.bz2 New: ---- ddskk-14.4.tar.bz2 ddskk-rpmlintrc flavour.patch skk-emacs-type.patch skkdic-20110529.orig.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ddskk.spec ++++++ --- /var/tmp/diff_new_pack.oMVvnD/_old 2012-07-06 09:26:45.000000000 +0200 +++ /var/tmp/diff_new_pack.oMVvnD/_new 2012-07-06 09:26:45.000000000 +0200 @@ -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: 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 @@ %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 @@ %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 @@ %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 @@ %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 @@ %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 ++++++ bugzilla-141756-workaround.patch ++++++ --- /var/tmp/diff_new_pack.oMVvnD/_old 2012-07-06 09:26:45.000000000 +0200 +++ /var/tmp/diff_new_pack.oMVvnD/_new 2012-07-06 09:26:45.000000000 +0200 @@ -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. + ++++++ ddskk-20050123.tar.bz2 -> ddskk-14.4.tar.bz2 ++++++ ++++ 85681 lines of diff (skipped) ++++++ ddskk-rpmlintrc ++++++ addFilter(".*rpm-buildroot-usage.") addFilter(".*macro-in-comment.") ++++++ flavour.patch ++++++ --- 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)) ++++++ skk-emacs-type.patch ++++++ Description: Don't use the abolished variable `skk-emacs-type' Author: Tatsuya Kinoshita <[email protected]> 2012-01-04 Tatsuya Kinoshita <[email protected]> * 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 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
