pool/tamago
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 197950 from M17N

Browse Source 
- Fix tamago.changes:
  Fixed comment style .
- Fix tamago.spec:
  * fix commented-out macros: were changed to "_" .
    Because rpmlint tells them warning messages .
  * Source[234]'s URLs were dead, so I deleted URL .
  * Changed egg_4.0.6+0.20041122cvs-19.diff.gz
    to patch from source .
  * I deleted Japanese EUC-JP encoding comments .
  * I added a comment why am I import sources from Debian .
    Because upstream http://www.m17n.org/tamago was dead .
- Fix tamago-fix-access-to-fwnn.patch .
  I forgot to change comm-accept-timeout from nil to 1000
  in egg-com.el .
  So insert it in tamago-fix-access-to-fwnn.patch .
- Fix Version: tag in tamago.spec .
  I changed version string to Debian format .
  But its string was wrong, then fixed to openSUSE format .
- Fix that tamago can not access to FreeWnn's jserver
  (bnc#836138) .
  * Update to egg_4.0.6_20041122cvs.orig.tar.gz:
  * Imported source from http://packages.debian.org/wheezy/egg .
    http://ftp.de.debian.org/debian/pool/main/e/egg/egg_4.0.6+0.20041122cvs-19.dsc
    http://ftp.de.debian.org/debian/pool/main/e/egg/egg_4.0.6+0.20041122cvs.orig.tar.gz
    http://ftp.de.debian.org/debian/pool/main/e/egg/egg_4.0.6+0.20041122cvs-19.diff.gz
    Because upstream http://www.m17n.org/tamago wad dead,
    and egg_4.0.6+0.20041122cvs-19.diff.gz was fixed bnc#836138 .
  * Deleted source
    http://cgi18.plala.or.jp/nyy/canna/egg-canna.el.bz2 .
    Because this program can not run on Emacs-24.3-4.3 . (forwarded request 197943 from Mitsutoshi)

OBS-URL: https://build.opensuse.org/request/show/197950
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tamago?expand=0&rev=13
This commit is contained in:
Stephan Kulow 2013-09-11 11:20:12 +00:00 committed by Git OBS Bridge
parent ef8ce7cf64
commit 8e357d87b7
8 changed files with 206 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
egg-canna.el.bz2
View File

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

3
egg_4.0.6+0.20041122cvs-19.diff.gz Normal file
View File

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

30
egg_4.0.6+0.20041122cvs-19.dsc Normal file
View File

@ -0,0 +1,30 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.0
Source: egg
Binary: egg
Architecture: all
Version: 4.0.6+0.20041122cvs-19
Maintainer: ISHIKAWA Mutsumi <ishikawa@debian.org>
Standards-Version: 3.8.3
Build-Depends: debhelper (>> 5.0.0)
Package-List:
egg deb utils extra
Checksums-Sha1:
2bacd302e5b8e30c136ba477b311e4df8d001ce7 287308 egg_4.0.6+0.20041122cvs.orig.tar.gz
74cc843a351af1e610bd587ca507627b2faa44f6 28417 egg_4.0.6+0.20041122cvs-19.diff.gz
Checksums-Sha256:
722413515f2d60418d98250c8aed2b811e6b5363cdb69899193d454afe425115 287308 egg_4.0.6+0.20041122cvs.orig.tar.gz
bd4252d0536c1eeb526789063b822b9b9e75f2bbec9c3db97792ce0ee3b89fb0 28417 egg_4.0.6+0.20041122cvs-19.diff.gz
Files:
64ec1af61f6e265c05447dd4e2a83aae 287308 egg_4.0.6+0.20041122cvs.orig.tar.gz
e02a2caa127ced9d75900d8145b9eab4 28417 egg_4.0.6+0.20041122cvs-19.diff.gz
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iEYEARECAAYFAk+kpe0ACgkQfi8w7uypT6jO9gCdHh3ud50Y92/4kernAxh9Y6Mi
1moAnjbxWgLi6FGjsQsZ1ZQjDETk1r+A
=Ukdw
-----END PGP SIGNATURE-----

3
egg_4.0.6+0.20041122cvs.orig.tar.gz Normal file
View File

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

3
tamago-4.0.6_20011017cvs.tar.bz2
View File

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

78
tamago-fix-access-to-fwnn.patch Normal file
View File

@ -0,0 +1,78 @@
From: Mitsutoshi NAKANO <bkbin005@rinku.zaq.ne.jp>
Date: 2013-08-27 14:52:16 +0900
Subject: Fix that Emacs's tamago can not access to FreeWnn's jserver .
References: bnc#836138
Upstream: dead
I fixed that Emacs's tamago can not access to FreeWnn's jserver .
0. I inported new tar ball from
http://packages.debian.org/wheezy/egg .
1. I deleted (make-local-hook) function .
2. Defvaralias 'last-command-char 'last-command-event .
3. I deleted egg-canna.el .
4. I changed comm-accept-timeout from nil to 1000 in egg-com.el .
---
diff -ur egg-4.0.6+0.20041122cvs.05-oldprep/egg-com.el egg-4.0.6+0.20041122cvs/egg-com.el
--- egg-4.0.6+0.20041122cvs.05-oldprep/egg-com.el 2013-08-27 10:32:53.809412379 +0900
+++ egg-4.0.6+0.20041122cvs/egg-com.el 2013-08-28 06:54:50.607995017 +0900
@@ -822,7 +822,7 @@
(error "comm-format %s: arguments mismatch" format))
result))
-(defvar comm-accept-timeout nil)
+(defvar comm-accept-timeout 1000)
;; Assume PROC is bound to the process of current buffer
;; Do not move the point, leave it where it was.
diff -ur egg-4.0.6+0.20041122cvs.05-oldprep/egg.el egg-4.0.6+0.20041122cvs/egg.el
--- egg-4.0.6+0.20041122cvs.05-oldprep/egg.el 2013-08-27 10:32:53.808412379 +0900
+++ egg-4.0.6+0.20041122cvs/egg.el 2013-08-25 12:58:57.622094211 +0900
@@ -30,6 +30,11 @@
;;; Code:
+;;; for 24.3 and later
+(if (string< "24.3" emacs-version)
+ (progn
+ (defvaralias 'last-command-char 'last-command-event)))
+
(defconst egg-version "4.0.6+20020909cvs"
"Version number for this version of Tamago.")
@@ -169,7 +174,7 @@
(setq egg-modeless-mode t))
(setq inactivate-current-input-method-function 'egg-mode)
(setq describe-current-input-method-function 'egg-help)
- (make-local-hook 'input-method-activate-hook)
+;;; (make-local-hook 'input-method-activate-hook)
(add-hook 'input-method-activate-hook 'its-set-mode-line-title nil t)
(if (eq (selected-window) (minibuffer-window))
(add-hook 'minibuffer-exit-hook 'egg-exit-from-minibuffer))
diff -ur egg-4.0.6+0.20041122cvs.05-oldprep/menudiag.el egg-4.0.6+0.20041122cvs/menudiag.el
--- egg-4.0.6+0.20041122cvs.05-oldprep/menudiag.el 2001-01-28 03:53:13.000000000 +0900
+++ egg-4.0.6+0.20041122cvs/menudiag.el 2013-08-27 11:46:32.615174586 +0900
@@ -503,7 +503,7 @@
(make-local-variable 'inhibit-read-only)
(setq buffer-read-only t
inhibit-read-only nil)
- (make-local-hook 'post-command-hook)
+;;; (make-local-hook 'post-command-hook)
(add-hook 'post-command-hook 'menudiag-selection-align-to-item nil t)
(use-local-map menudiag-selection-map)
(setq mode-name "Menudiag Selection")
diff -ur egg-4.0.6+0.20041122cvs.05-oldprep/suse-start.el egg-4.0.6+0.20041122cvs/suse-start.el
--- egg-4.0.6+0.20041122cvs.05-oldprep/suse-start.el 2013-08-25 15:56:40.255474625 +0900
+++ egg-4.0.6+0.20041122cvs/suse-start.el 2013-08-27 14:36:47.539624883 +0900
@@ -1,8 +1 @@
(load "/usr/share/emacs/site-lisp/egg/leim-list")
-
-;; egg-canna.el makes the CANNA commands of emcws available with tamago.
-;; egg-canna.el is already part of the tamago package in SuSE GNU/Linux.
-;; to use it you need the following hook:
-
-(add-hook 'canna-load-hook '(lambda () (load "egg-canna.el")))
-

39
tamago.changes
View File

@ -1,3 +1,42 @@
-------------------------------------------------------------------
Sun Sep 8 17:07:40 UTC 2013 - bkbin005@rinku.zaq.ne.jp
- Fix tamago.changes:
Fixed comment style .
- Fix tamago.spec:
* fix commented-out macros: were changed to "_" .
Because rpmlint tells them warning messages .
* Source[234]'s URLs were dead, so I deleted URL .
* Changed egg_4.0.6+0.20041122cvs-19.diff.gz
to patch from source .
* I deleted Japanese EUC-JP encoding comments .
* I added a comment why am I import sources from Debian .
Because upstream http://www.m17n.org/tamago was dead .
- Fix tamago-fix-access-to-fwnn.patch .
I forgot to change comm-accept-timeout from nil to 1000
in egg-com.el .
So insert it in tamago-fix-access-to-fwnn.patch .
- Fix Version: tag in tamago.spec .
I changed version string to Debian format .
But its string was wrong, then fixed to openSUSE format .
- Fix that tamago can not access to FreeWnn's jserver
(bnc#836138) .
* Update to egg_4.0.6_20041122cvs.orig.tar.gz:
* Imported source from http://packages.debian.org/wheezy/egg .
http://ftp.de.debian.org/debian/pool/main/e/egg/egg_4.0.6+0.20041122cvs-19.dsc
http://ftp.de.debian.org/debian/pool/main/e/egg/egg_4.0.6+0.20041122cvs.orig.tar.gz
http://ftp.de.debian.org/debian/pool/main/e/egg/egg_4.0.6+0.20041122cvs-19.diff.gz
Because upstream http://www.m17n.org/tamago wad dead,
and egg_4.0.6+0.20041122cvs-19.diff.gz was fixed bnc#836138 .
* Deleted source
http://cgi18.plala.or.jp/nyy/canna/egg-canna.el.bz2 .
Because this program can not run on Emacs-24.3-4.3 .
* Added tamago-fix-access-to-fwnn.patch .
Deleted (make-local-hook) function .
And defvaralias 'last-command-char 'last-command-event .
Because their function and variable are deleted
from Emacs-24.3 .
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jan 25 21:48:15 CET 2006 - mls@suse.de Wed Jan 25 21:48:15 CET 2006 - mls@suse.de

103
tamago.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package tamago (Version 4.0.6_20011017cvs) # spec file for package tamago
# #
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -15,17 +15,20 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
# norootforbuild
Name: tamago Name: tamago
BuildRequires: emacs-x11 giflib-devel libpng-devel libtiff-devel xorg-x11-devel BuildRequires: emacs-x11
License: GPL-2.0+ BuildRequires: giflib-devel
Group: System/I18n/Japanese BuildRequires: libpng-devel
BuildRequires: libtiff-devel
BuildRequires: xorg-x11-devel
Requires: emacs Requires: emacs
AutoReqProv: on # updated 2013-08-27
Version: 4.0.6_20011017cvs #Version: 4.0.6_20011017cvs
Release: 848 Version: 4.0.6_20041122cvs
Release: 0
#Version: 4.0.6+0.20041122cvs # this version string is wrong .
Url: http://www.m17n.org/tamago Url: http://www.m17n.org/tamago
# Other useful, tamago related URLs: # Other useful, tamago related URLs:
# http://emacs-20.ki.nu/tamago/ # http://emacs-20.ki.nu/tamago/
@ -38,27 +41,39 @@ Url: http://www.m17n.org/tamago
# get the tamago CVS source with: # get the tamago CVS source with:
# cvs -d :pserver:anonymous@cvs.m17n.org:/cvs/tamago co tamago # cvs -d :pserver:anonymous@cvs.m17n.org:/cvs/tamago co tamago
# and create the following tarball: # and create the following tarball:
Source0: tamago-%{version}.tar.bz2 #Source0: tamago-_{version}.tar.bz2
Source1: http://cgi18.plala.or.jp/nyy/canna/egg-canna.el.bz2
Source2: http://www.gcd.org/sengoku/boiling-egg/boiling-egg.el.bz2 # 2013-08-27 - bkbin005@rinku.zaq.ne.jp
Source3: http://www.m17n.org/tamago/pdf/ISFST99.pdf.bz2 # imported source from http://packages.debian.org/wheezy/egg .
Source4: http://www.m17n.org/tamago/pdf/LC99.pdf.bz2 # Because upstream http://www.m17n.org/tamago was dead,
# and egg_4.0.6+0.20041122cvs-19.diff.gz was fixed bnc#836138 .
Source0: http://ftp.de.debian.org/debian/pool/main/e/egg/egg_4.0.6+0.20041122cvs.orig.tar.gz
# egg-canna.el was deleted 2013-08-27 by bkbin005@rinku.zaq.ne.jp
#Source1: http://cgi18.plala.or.jp/nyy/canna/egg-canna.el.bz2
# 2013-09-09 - bkbin005@rinku.zaq.ne.jp
# Source[234]'s URLs were dead, so I deleted URL .
#Source2: http://www.gcd.org/sengoku/boiling-egg/boiling-egg.el.bz2
#Source3: http://www.m17n.org/tamago/pdf/ISFST99.pdf.bz2
#Source4: http://www.m17n.org/tamago/pdf/LC99.pdf.bz2
Source2: boiling-egg.el.bz2
Source3: ISFST99.pdf.bz2
Source4: LC99.pdf.bz2
Source5: suse-start.el Source5: suse-start.el
# imported from http://packages.debian.org/wheezy/egg .
Source6: http://ftp.de.debian.org/debian/pool/main/e/egg/egg_4.0.6+0.20041122cvs-19.dsc
Patch0: eggrc.patch Patch0: eggrc.patch
# imported from http://packages.debian.org/wheezy/egg .
#PATCH-FIX-UPSTREAM egg_4.0.6+0.20041122cvs-19.diff.gz bnc#836138 bkbin005@rinku.zaq.ne.jp
Patch1: http://ftp.de.debian.org/debian/pool/main/e/egg/egg_4.0.6+0.20041122cvs-19.diff.gz
#PATCH-FIX-OPENSUSE tamago-fix-access-to-fwnn.patch bnc#836138 bkbin005@rinku.zaq.ne.jp
Patch2: tamago-fix-access-to-fwnn.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch BuildArch: noarch
Summary: Multilingual input method for Emacs Summary: Multilingual input method for Emacs
# Summary(ja): Emacs のための多言語入力方法 License: GPL-2.0+
# %description -l ja Group: System/I18n/Japanese
# すべてのソースが Emacs Lisp で実現されており、Tamago は、GNU Emacs
# 20.5 以降で多言語入力環境を提供します。バックエンドサーバとしては、
# FreeWnn (jserver, cserver, tserver), Wnn6, SJ3 Ver.2, Canna に対応しています。
#
# 著者：
# ------
# NIIBE Yutaka <gniibe@chroot.org>
# KATAYAMA Yoshio <kate@pfu.co.jp>
# TOMURA Satoru <tomura@etl.go.jp>
%description %description
Tamago offers a multilingual input environment for GNU Emacs (>= 20.5). Tamago offers a multilingual input environment for GNU Emacs (>= 20.5).
@ -75,21 +90,25 @@ Authors:
%prep %prep
%setup -n tamago %setup -n egg-4.0.6+0.20041122cvs
%patch0 -p 1 %patch1 -p1
%patch0 -p1
cp -p $RPM_SOURCE_DIR/suse-start.el . cp -p $RPM_SOURCE_DIR/suse-start.el .
cp -p $RPM_SOURCE_DIR/egg-canna.el.bz2 . #cp -p $RPM_SOURCE_DIR/egg-canna.el.bz2 . # deleted 2013-08-27 .
cp -p $RPM_SOURCE_DIR/boiling-egg.el.bz2 . cp -p $RPM_SOURCE_DIR/boiling-egg.el.bz2 .
cp -p $RPM_SOURCE_DIR/*.pdf.bz2 . cp -p $RPM_SOURCE_DIR/*.pdf.bz2 .
bunzip2 *.bz2 bunzip2 *.bz2
find -type d -name "CVS" | xargs rm -rfv find -type d -name "CVS" | xargs rm -rfv
%patch2 -p1
%build %build
%define emacs_sitelisp_dir %{_datadir}/emacs/site-lisp %define emacs_sitelisp_dir %{_datadir}/emacs/site-lisp
%define emacs_package_dir %{emacs_sitelisp_dir}/egg %define emacs_package_dir %{emacs_sitelisp_dir}/egg
./configure --prefix=/usr ./configure --prefix=/usr
make make
for i in egg-canna boiling-egg for i in boiling-egg # egg-canna was deleted 2013-08-27
do do
emacs -batch -q -no-site-file -no-init-file -f batch-byte-compile $i.el emacs -batch -q -no-site-file -no-init-file -f batch-byte-compile $i.el
done done
@ -100,7 +119,7 @@ if [ -n "%{?buildroot}" ] ; then
fi fi
mkdir -p $RPM_BUILD_ROOT%{emacs_sitelisp_dir} mkdir -p $RPM_BUILD_ROOT%{emacs_sitelisp_dir}
make install prefix=$RPM_BUILD_ROOT/usr make install prefix=$RPM_BUILD_ROOT/usr
for i in egg-canna boiling-egg for i in boiling-egg # egg-canna was deleted 2013-08-27 .
do do
install -m644 $i.{el,elc} $RPM_BUILD_ROOT%{emacs_sitelisp_dir} install -m644 $i.{el,elc} $RPM_BUILD_ROOT%{emacs_sitelisp_dir}
done done
@ -122,26 +141,10 @@ rm -fr $RPM_BUILD_ROOT
%doc AUTHORS COPYING ChangeLog* PROBLEMS README* TODO *.pdf doc/* %doc AUTHORS COPYING ChangeLog* PROBLEMS README* TODO *.pdf doc/*
%{emacs_package_dir} %{emacs_package_dir}
%config %{emacs_sitelisp_dir}/suse-start-%{name}.el %config %{emacs_sitelisp_dir}/suse-start-%{name}.el
%{emacs_sitelisp_dir}/egg-canna.el # egg-canna was deleted 2013-08-27 by bkbin005@rinku.zaq.ne.jp
%{emacs_sitelisp_dir}/egg-canna.elc #_{emacs_sitelisp_dir}/egg-canna.el
#_{emacs_sitelisp_dir}/egg-canna.elc
%{emacs_sitelisp_dir}/boiling-egg.el %{emacs_sitelisp_dir}/boiling-egg.el
%{emacs_sitelisp_dir}/boiling-egg.elc %{emacs_sitelisp_dir}/boiling-egg.elc
%changelog %changelog
* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
* Fri Feb 06 2004 hmacht@suse.de
- building as non-root
* Wed May 21 2003 ro@suse.de
- remove CVS subdirs
* Wed Nov 13 2002 ro@suse.de
- use x-devel-packages
* Fri Feb 01 2002 ro@suse.de
- changed neededforbuild <libpng> to <libpng-devel-packages>
* Thu Nov 15 2001 mfabian@suse.de
- small fix to suse-start-tamago.el to make it work with Emacs 21
again
* Fri Nov 09 2001 mfabian@suse.de
- add libjpeg libpng libtiff libungif to '# neededforbuild'
* Fri Oct 19 2001 mfabian@suse.de
- new package: tamago-4.0.6_20011017cvs