rpms/ddskk/F-11 ddskk-emacs22-503185.patch, NONE, 1.1 ddskk.spec, 1.11, 1.12

[Jens Petersen]

Author: petersen

Update of /cvs/extras/rpms/ddskk/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6573

Modified Files:
	ddskk.spec 
Added Files:
	ddskk-emacs22-503185.patch 
Log Message:
fix skk-e21 error with emacs22 (patch from Masatake Yamato, #503185)

ddskk-emacs22-503185.patch:

--- NEW FILE ddskk-emacs22-503185.patch ---
diff -ruN -x '*~' ddskk-12.2.0.orig/SKK-MK ddskk-12.2.0/SKK-MK
--- ddskk-12.2.0.orig/SKK-MK	2009-05-29 22:28:19.000000000 +0900
+++ ddskk-12.2.0/SKK-MK	2009-05-29 22:41:34.000000000 +0900
@@ -325,7 +325,7 @@
 	  ;; FSFmacs
 	  (when (featurep 'faces)
 	    (add-to-list 'list 'ccc))
-	  (when (= emacs-major-version 21)
+	  (when (string< "5.0" mule-version)
 	    (add-to-list 'list 'skk-e21))))
 	;; skk-jisx0213.el
 	(when (condition-case nil


Index: ddskk.spec
===================================================================
RCS file: /cvs/extras/rpms/ddskk/F-11/ddskk.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- ddskk.spec	24 Feb 2009 11:15:55 -0000	1.11
+++ ddskk.spec	22 Jun 2009 06:49:39 -0000	1.12
@@ -6,7 +6,7 @@
 Summary: Daredevil SKK - Simple Kana to Kanji conversion program for Emacs
 Name: ddskk
 Version: 12.2.0
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: GPLv2+
 Group: Applications/Editors
 URL: http://openlab.ring.gr.jp/skk/main.html
@@ -22,6 +22,7 @@ Obsoletes: skk, ddskk-el
 # for xemacs-21.5
 Patch1: ddskk-12.2.0-xemacs-21.5-fixup-autoload.patch
 Patch2: ddskk-string-to-char-list-201524.patch
+Patch3: ddskk-emacs22-503185.patch
 
 %description
 Daredevil SKK is a branch of SKK (Simple Kana to Kanji conversion program,
@@ -52,15 +53,16 @@ separately.
 
 %prep
 %setup -q
-%patch1 -p1 -b .1-xemacs-fixup
-%patch2 -p1 -b .2-charlist
+%patch1 -p1 -b .1-xemacs-fixup~
+%patch2 -p1 -b .2-charlist~
+%patch3 -p1 -b .3-emacs22~
 
 # avoid buildroot in tutorial path
 sed -ie "s!@TUT@!%{_datadir}/skk/SKK.tut!" skk-setup.el.in
 
 
 %build
-
+%{nil}
 
 %install
 rm -fr %buildroot
@@ -107,12 +109,15 @@ fi
 
 
 %files xemacs
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc ChangeLog READMEs
 %{pkgdir}
 
 
 %changelog
+* Mon Jun 22 2009 Jens Petersen <petersen at redhat.com> - 12.2.0-13
+- fix skk-e21 error with emacs22 (patch from Masatake Yamato, #503185)
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 12.2.0-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild