diff --git a/emacs.spec b/emacs.spec index 979a14d..fcdc714 100644 --- a/emacs.spec +++ b/emacs.spec @@ -1,7 +1,8 @@ +%define enable_japanese 1 Summary: The libraries needed to run the GNU Emacs text editor. Name: emacs Version: 20.7 -Release: 14 +Release: 14j3 Copyright: GPL Group: Applications/Editors Source0: ftp://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.gz @@ -12,6 +13,11 @@ Source5: dotemacs Source6: site-start.el Source7: http://www.python.org/emacs/python-mode/python-mode.el Source10: lisp-startup-localealias.patch +# for Japanese +#Source100: emacs.wmconfig +Source101: dotemacs-j +Source102: dotemacs.el-j + Patch0: emacs-20.7-xaw3d.patch Patch2: emacs-20.3-tmprace.patch Patch3: emacs-20.3-linkscr.patch @@ -23,6 +29,17 @@ Patch8: emacs-20.6-ia64-2.patch Patch9: emacs-20.6-ia64-3.patch Patch10: emacs-20.7-manboption.patch +# for Japanese +Patch100: ftp://ftp.ki.nu/pub/emcws/emcws-%{version}-20000614 +Patch101: emacs-20.4-xim-19990816.diff +Patch102: emacs-20.4-fontset-19990915.diff +Patch103: emacs-20.7-rhwnn6.patch + +%if %{enable_japanese} +BuildRequires: Wnn6-SDK-devel, Canna-devel +Obsoletes: mule-base, mule-canna , mule-wnn6 , mule ,emacs-X11-Canna,emacs-X11-Wnn4,emacs-X11-Wnn6, emacs-nox-Canna, emacs-nox-Wnn4,emacs-nox-Wnn6 +%endif + %ifarch ia64 %define _payload_compression w3.gzdio %endif @@ -84,7 +101,7 @@ install the emacs package in order to run Emacs. %package X11 Summary: The Emacs text editor for the X Window System. Group: Applications/Editors -Requires: emacs +Requires: emacs, XFree86-jpfonts %description X11 Emacs-X11 includes the Emacs text editor program for use with the X @@ -112,6 +129,12 @@ also need to install the emacs package in order to run Emacs. %patch8 -p1 %patch9 -p1 %patch10 -p1 +%if %{enable_japanese} +%patch100 -p1 +%patch101 -p1 +%patch102 -p0 +%patch103 -p1 +%endif %build @@ -119,7 +142,11 @@ PUREDEF="-DNCURSES_OSPEED_T" XPUREDEF="-DNCURSES_OSPEED_T" libtoolize --force --copy autoconf +%if %{enable_japanese} +CONFOPTS="--mandir=%{_mandir} --infodir=%{_infodir} --prefix=/usr --libexecdir=/usr/lib --sharedstatedir=/var --with-gcc --with-pop --with-wnn6 --with-wnn-includes=/usr/include/wnn6 --with-canna --with-canna-includes=/usr/canna/include --with-canna-libraries=/usr/lib" +%else CONFOPTS="--mandir=%{_mandir} --infodir=%{_infodir} --prefix=/usr --libexecdir=/usr/lib --sharedstatedir=/var --with-gcc --with-pop" +%endif BuildEmacs() { dir=$1 @@ -198,8 +225,11 @@ install -c -m0644 python-mode.elc $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/ # default initialization file mkdir -p $RPM_BUILD_ROOT/etc/skel +%if %{enable_japanese} +install -c -m0644 %SOURCE102 $RPM_BUILD_ROOT/etc/skel/.emacs.el +%else install -c -m0644 %SOURCE5 $RPM_BUILD_ROOT/etc/skel/.emacs - +%endif # # create file lists # @@ -294,7 +324,11 @@ fi %files -f core-filelist %defattr(-,root,root) +%if %{enable_japanese} +%config(noreplace) /etc/skel/.emacs.el +%else %config(noreplace) /etc/skel/.emacs +%endif %doc etc/NEWS BUGS README etc/FAQ /usr/bin/b2m /usr/bin/emacsclient @@ -338,17 +372,27 @@ fi /usr/share/pixmaps/emacs.png %changelog -* Thu Aug 24 2000 Trond Eivind Glomsr�d +* Wed Sep 13 2000 ISHIKAWA Mutsumi +- update /etc/skel/.emacs.el file + +* Wed Sep 13 2000 ISHIKAWA Mutsumi +- emacs-nox requires XFree86-jpfonts, so fix. + only emacs-X11 requires XFree86-jpfonts. + +* Wed Sep 13 2000 ISHIKAWA Mutsumi +- inport emacs-cws changes to support Japanese input methods + +* Thu Aug 24 2000 Trond Eivind Glomsrd - define MAIL_USE_LOCKF - remove setgid on movemail -* Mon Aug 07 2000 Trond Eivind Glomsr�d +* Mon Aug 07 2000 Trond Eivind Glomsrd - add /usr/share/emacs/site-lisp/subdirs.el (#15639) -* Tue Jul 25 2000 Trond Eivind Glomsr�d +* Tue Jul 25 2000 Trond Eivind Glomsrd - remove "-b" option from manpage -* Fri Jul 21 2000 Trond Eivind Glomsr�d +* Fri Jul 21 2000 Trond Eivind Glomsrd - remove Japanese support * Mon Jul 17 2000 Matt Wilson @@ -357,13 +401,13 @@ fi * Wed Jul 12 2000 Prospector - automatic rebuild -* Fri Jul 07 2000 Trond Eivind Glomsr�d +* Fri Jul 07 2000 Trond Eivind Glomsrd - fix some typos in spec file -* Sun Jul 02 2000 Trond Eivind Glomsr�d +* Sun Jul 02 2000 Trond Eivind Glomsrd - make /etc/skel/.emacs 0644 -* Wed Jun 28 2000 Trond Eivind Glomsr�d +* Wed Jun 28 2000 Trond Eivind Glomsrd - include python mode and change in site-start.el related to this - some changes to the default .emacs @@ -372,11 +416,11 @@ fi bug that causes crashes in the garbage collector - removed all the nox Japanese packages -* Mon Jun 19 2000 Trond Eivind Glomsr�d +* Mon Jun 19 2000 Trond Eivind Glomsrd - include site-start.el as a a config file - add aspell support via the above -* Fri Jun 16 2000 Trond Eivind Glomsr�d +* Fri Jun 16 2000 Trond Eivind Glomsrd - (from MSW) different compression on IA64 to avoid hangs - remove etags/ctags - use a separate package. Disable patch1 @@ -385,13 +429,13 @@ fi - fixed a missing escaped " in a wc string - merge japanese support to head of development -* Tue Jun 13 2000 Trond Eivind Glomsr�d +* Tue Jun 13 2000 Trond Eivind Glomsrd - Version 20.7 - Add requirement for final newline to the default .emacs - redid the Xaw3d patch - checked all patches, discarded those we've upstreamed -* Wed Jun 07 2000 Trond Eivind Glomsr�d +* Wed Jun 07 2000 Trond Eivind Glomsrd - use %%{_mandir} and %%{_infodir} * Fri Jun 2 2000 Bill Nottingham @@ -400,40 +444,40 @@ fi * Mon May 22 2000 Bill Nottingham - add another ia64 patch -* Fri May 19 2000 Trond Eivind Glomsr�d +* Fri May 19 2000 Trond Eivind Glomsrd - Disabled the compile patch for 20.6 * Thu May 18 2000 Bill Nottingham - add in ia64 patch -* Thu May 18 2000 Trond Eivind Glomsr�d +* Thu May 18 2000 Trond Eivind Glomsrd - don't apply the unexelf patch - use a new unexelf.c file from the 21 source tree (this will go into the 20.7 tree) -* Wed May 17 2000 Trond Eivind Glomsr�d +* Wed May 17 2000 Trond Eivind Glomsrd - added patch by jakub to make it work with glibc2.2 -* Mon May 08 2000 Trond Eivind Glomsr�d +* Mon May 08 2000 Trond Eivind Glomsrd - fixed a problem with ange-ftp and kerberized ftp * Mon May 08 2000 Bernhard Rosenkraenzer - rebuild with new Xaw3d -* Thu Apr 20 2000 Trond Eivind Glomsr�d +* Thu Apr 20 2000 Trond Eivind Glomsrd - let the build system handle gzipping man pages and stripping - added patch to increase keyboard buffer size -* Thu Apr 20 2000 Trond Eivind Glomsr�d +* Thu Apr 20 2000 Trond Eivind Glomsrd - gzip man pages -* Thu Apr 20 2000 Trond Eivind Glomsr�d +* Thu Apr 20 2000 Trond Eivind Glomsrd - added a security patch from RUS-CERT, which fixes bugs mentioned in "Advisory 200004-01: GNU Emacs 20" -* Tue Apr 18 2000 Trond Eivind Glomsr�d +* Tue Apr 18 2000 Trond Eivind Glomsrd - patched to detect bash2 scripts. -* Thu Apr 06 2000 Trond Eivind Glomsr�d +* Thu Apr 06 2000 Trond Eivind Glomsrd - removed configuraton file status from /usr/share/pixmaps/emacs.png * Fri Mar 24 2000 Bernhard Rosenkraenzer