|
|
@@ -1,5 +1,5 @@
|
|
|
%define _noVersionedDependencies 1
|
|
|
-%define prereq_ge() %(LC_ALL="C" rpm -q --queryformat 'PreReq:%%{NAME} >= %%{VERSION}' %1| grep -v "is not")
|
|
|
+%define prereq_ge() %(LC_ALL="C" rpm -q --queryformat 'Requires(pre):%%{NAME} >= %%{VERSION}' %1| grep -v "is not")
|
|
|
%define _libdir %{_prefix}/lib
|
|
|
%define origver 4.0.6
|
|
|
%define origname tamago
|
|
|
@@ -9,7 +9,7 @@ Summary: Tamago Version 4 -- EGG Input Method Architecture for Emacsen
|
|
|
Summary(ja): たまご第4版
|
|
|
Name: %{origname}
|
|
|
Version: %{origver}
|
|
|
-Release: 10.egganthy%{egg_anthy_version}%{?_dist_release}
|
|
|
+Release: 11.egganthy%{egg_anthy_version}%{?_dist_release}
|
|
|
|
|
|
Source0: ftp://ftp.m17n.org/pub/%{origname}/%{origname}-%{origver}.tar.gz
|
|
|
Source1: %{origname}-install.sh
|
|
|
@@ -34,13 +34,15 @@ Patch40: tamago-4.0.6-wnn8_rev2.patch
|
|
|
### from http://www.m17n.org/mlarchive/mule-ja/200703/msg00018.html
|
|
|
Patch50: tamago-4.0.6-emacs23.patch
|
|
|
|
|
|
+Patch60: tamago-4.0.6-make-local-hook-obsoleted.patch
|
|
|
+
|
|
|
License: GPL
|
|
|
Group: Applications/Editors/Emacs
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
|
|
|
Requires: emacsen
|
|
|
Requires: emacsen-common
|
|
|
-BuildPreReq: apel
|
|
|
+BuildRequires: apel
|
|
|
%prereq_ge apel
|
|
|
Obsoletes: tamago-el
|
|
|
|
|
|
@@ -76,6 +78,7 @@ cserver, tserver), Wnn6, SJ3 Ver.2,canna に対応。
|
|
|
%patch30 -p1
|
|
|
%patch40 -p1
|
|
|
%patch50 -p1
|
|
|
+%patch60 -p1
|
|
|
|
|
|
# rename canna stuff
|
|
|
#mv egg/canna.el egg/canna-tamago.el
|
|
|
@@ -173,6 +176,9 @@ fi
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Fri Apr 29 2011 MATSUBAYASHI Kohji <shaolin@vinelinux.org> 4.0.6-11.egganthy20070606
|
|
|
+- added Patch60, as 'make-local-hook' is obsoleted on emacs24
|
|
|
+
|
|
|
* Sun Apr 17 2011 IWAI, Masaharu <iwai@alib.jp> 4.0.6-10.egganthy20070606
|
|
|
- new release number for RPM package
|
|
|
- update description
|
shaolin