Accepting request 284194 from M17N

1

OBS-URL: https://build.opensuse.org/request/show/284194
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tamago?expand=0&rev=18

egg_4.0.6+0.20041122cvs-19.diff.gz

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

egg_4.0.6+0.20041122cvs-19.dsc

@@ -1,30 +0,0 @@
------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-----

egg_4.0.6+0.20041122cvs.orig.tar.gz

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

tamago-fix-access-to-fwnn.patch

@@ -1,78 +0,0 @@
-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")))
--

tamago-tsunagi-5.0.7.1.tar.gz

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

tamago.changes

@@ -1,3 +1,40 @@
+-------------------------------------------------------------------
+Tue Feb  3 22:33:28 UTC 2015 - bkbin005@rinku.zaq.ne.jp
+
+- Change upstream Debian -> Tamago-tsunagi.
+  Tamago's upstream died with m17n.org.
+  So many distros imported Egg(= tamago) from Debian,
+  and Each applied patches to them independently.
+  It is nonefficiency, so I made new upstream project.
+  Tamago-tsunagi-5.0.7.1 imported patches
+  from FreeBSD's tamago-emacs24-4.0.6.0.20041122.19_12.
+  https://www.freebsd.org/cgi/ports.cgi?query=tamago&stype=all .
+  Because FreeBSD's tamago advances most.
+  Now, Tamago-tsunagi goes along with FreeBSD's tamago maintainer.
+- Fix (boo#915293) by Tamago-tsunagi.
+- Change BuildRequires emacs-X -> emacs-nox >= 23.
+  When building, tamago does not need X,
+  tamago-tsunagi needs Emacs-nox >= 23.
+- Change Requires emacs -> emacs >= 23.
+  tamago-tsunagi needs Emacs >= 23
+- Change URL m17n.org -> sourceforge.jp (tamago-tsunagi).
+- Delete Patch1 Patch2 Source6, tamago-tsunagi does not need them.
+  Patch1: egg_4.0.6+0.20041122cvs-19.diff.gz
+  Patch2: tamago-fix-access-to-fwnn.patch
+  Source6: egg_4.0.6+0.20041122cvs-19.dsc
+- Modify description: tamago depends Emacs >= 23, now.
+- Delete Authors from description.
+  Because they do not maintain Tamago-tsunagi.
+- Comment out BuildRoot:.
+- Add NEWS in doc.
+- Delete config from suse-start-tamago.el.
+  Because rpmlint warned it.
+- Add .nosearch in files.
+  Because rpmlint warns them, but they are necessary.
+  I did not write rpmlintrc.
+  Because I do not like to delete warn messages.
+- Modify Copyright year 2014 -> 2015.
+
 -------------------------------------------------------------------
 Sun Oct 19 02:48:23 UTC 2014 - crrodriguez@opensuse.org
 

tamago.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package tamago
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,77 +17,46 @@
 
 
 Name:           tamago
-BuildRequires:  emacs-x11
+#Upstream name is tamago-tsunagi
-Requires:       emacs
+%define tsunagiName %{name}-tsunagi
-# updated 2013-08-27
+# 2015-02-03 Mitsutoshi NAKANO <bkbin005@rinku.zaq.ne.jp>
-#Version:        4.0.6_20011017cvs
+# I think tamago does not need X.
-Version:        4.0.6_20041122cvs
+# tamago-tsunagi needs Emacs >= 23
+#BuildRequires:  emacs-x11
+BuildRequires:  emacs-nox >= 23
+Requires:       emacs >= 23
+Version:        5.0.7.1
 Release:        0
-#Version:        4.0.6+0.20041122cvs # this version string is wrong .
+Url:            http://sourceforge.jp/projects/tamago-tsunagi/
-
-Url:            http://www.m17n.org/tamago
 # Other useful, tamago related URLs:
 #     http://emacs-20.ki.nu/tamago/
 #     http://cgi18.plala.or.jp/~nyy/canna/
 #     http://www.gcd.org/sengoku/boiling-egg/
 #     ftp://ftp.ki.nu/pub/emcws/README.html  (obsoleted by tamago)
-# Source: ftp://ftp.m17n.org/pub/tamago/tamago-4.0.6.tar.gz
-# I think it is better to use the CVS version, it already contains Canna support
-# without the need of patches:
-# get the tamago CVS source with:
-#    cvs -d :pserver:anonymous@cvs.m17n.org:/cvs/tamago co tamago
-# and create the following tarball:
-#Source0:        tamago-_{version}.tar.bz2
 
-# 2013-08-27 - bkbin005@rinku.zaq.ne.jp
+Source0:        http://osdn.dl.sourceforge.jp/tamago-tsunagi/62701/%{tsunagiName}-%{version}.tar.gz
-# imported source from http://packages.debian.org/wheezy/egg .
+
-# 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
+Source3:        http://iij.dl.sourceforge.jp/tamago-tsunagi/62684/ISFST99.pdf.bz2
-Source4:        LC99.pdf.bz2
+Source4:        http://iij.dl.sourceforge.jp/tamago-tsunagi/62685/LC99.pdf.bz2
-
 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
-# imported from http://packages.debian.org/wheezy/egg .
+#BuildRoot:      %%{_tmppath}/%%{name}-%%{version}-build
-#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
 BuildArch:      noarch
 Summary:        Multilingual input method for Emacs
 License:        GPL-2.0+
 Group:          System/I18n/Japanese
 
 %description
-Tamago offers a multilingual input environment for GNU Emacs (>= 20.5).
+Tamago offers a multilingual input environment for GNU Emacs (>= 23.x).
 It is completely written in Emacs Lisp and can use the backends FreeWnn
 (jserver, cserver, tserver), Wnn6, SJ3 Ver.2, and Canna.
 
-
-
-Authors:
---------
-    NIIBE Yutaka <gniibe@chroot.org>
-    KATAYAMA Yoshio <kate@pfu.co.jp>
-    TOMURA Satoru <tomura@etl.go.jp>
-    
-
 %prep
-%setup -n egg-4.0.6+0.20041122cvs
+%setup -q -n %{tsunagiName}-%{version}
-%patch1 -p1
 %patch0 -p1
 
 cp -p $RPM_SOURCE_DIR/suse-start.el .
@@ -97,8 +66,6 @@ cp -p $RPM_SOURCE_DIR/*.pdf.bz2 .
 bunzip2 *.bz2
 find -type d -name "CVS" | xargs rm -rfv
 
-%patch2 -p1
-
 %build
 %define emacs_sitelisp_dir %{_datadir}/emacs/site-lisp
 %define emacs_package_dir %{emacs_sitelisp_dir}/egg
@@ -134,12 +101,11 @@ rm -fr $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog* PROBLEMS README* TODO *.pdf doc/*
+%doc AUTHORS COPYING ChangeLog* PROBLEMS README* TODO NEWS *.pdf doc/*
 %{emacs_package_dir}
-%config %{emacs_sitelisp_dir}/suse-start-%{name}.el
+%{emacs_package_dir}/egg/.nosearch
-# egg-canna was deleted 2013-08-27 by bkbin005@rinku.zaq.ne.jp
+%{emacs_package_dir}/its/.nosearch
-#_{emacs_sitelisp_dir}/egg-canna.el
+%{emacs_sitelisp_dir}/suse-start-%{name}.el
-#_{emacs_sitelisp_dir}/egg-canna.elc
 %{emacs_sitelisp_dir}/boiling-egg.el
 %{emacs_sitelisp_dir}/boiling-egg.elc