From fb8f644fe9d1447b260aa41c5570173d31d1ba13 Mon Sep 17 00:00:00 2001 From: Karel Klíč Date: May 11 2010 09:48:03 +0000 Subject: Added a patch fixing m17n and libotf version checking --- diff --git a/emacs-23.2-m17ncheck.patch b/emacs-23.2-m17ncheck.patch new file mode 100644 index 0000000..28e1f60 --- /dev/null +++ b/emacs-23.2-m17ncheck.patch @@ -0,0 +1,14 @@ +diff -up emacs-23.2/src/ftfont.c.m17ncheck emacs-23.2/src/ftfont.c +--- emacs-23.2/src/ftfont.c.m17ncheck 2010-05-11 11:22:19.977753842 +0200 ++++ emacs-23.2/src/ftfont.c 2010-05-11 11:22:44.545753979 +0200 +@@ -1578,8 +1578,8 @@ ftfont_otf_capability (font) + + #ifdef HAVE_M17N_FLT + +-#if ((LIBOTF_MAJOR_VERSION > 1) || (LIBOTF_RELEASE_NUMBER >= 10) \ +- && (M17NLIB_MAJOR_VERSION > 1) || (M17NLIB_MINOR_VERSION >= 6)) ++#if (((LIBOTF_MAJOR_VERSION > 1) || (LIBOTF_RELEASE_NUMBER >= 10)) \ ++ && ((M17NLIB_MAJOR_VERSION > 1) || (M17NLIB_MINOR_VERSION >= 6))) + /* We can use the new feature of libotf and m17n-flt to handle the + character encoding scheme introduced in Unicode 5.1 and 5.2 for + some Agian scripts. */ diff --git a/emacs.spec b/emacs.spec index 471678a..f6d1cd8 100644 --- a/emacs.spec +++ b/emacs.spec @@ -4,7 +4,7 @@ Summary: GNU Emacs text editor Name: emacs Epoch: 1 Version: 23.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ URL: http://www.gnu.org/software/emacs/ Group: Applications/Editors @@ -23,7 +23,10 @@ Source18: default.el Patch0: glibc-open-macro.patch Patch1: rpm-spec-mode.patch Patch3: rpm-spec-mode-utc.patch +# Not sent to upstream. Patch4: emacs-23.1-xdg.patch +# Not sent to upstream. +Patch5: emacs-23.2-m17ncheck.patch BuildRequires: atk-devel, cairo-devel, desktop-file-utils, freetype-devel, fontconfig-devel, dbus-devel, giflib-devel, glibc-devel, gtk2-devel, libpng-devel BuildRequires: libjpeg-devel, libtiff-devel, libX11-devel, libXau-devel, libXdmcp-devel, libXrender-devel, libXt-devel @@ -129,6 +132,7 @@ Emacs packages or see some elisp examples. %patch0 -p1 -b .glibc-open-macro %patch4 -p1 -b .xdg +%patch5 -p1 -b .m17ncheck # Install site-lisp files cp %SOURCE7 %SOURCE9 %SOURCE10 site-lisp @@ -388,6 +392,9 @@ alternatives --install %{_bindir}/etags emacs.etags %{_bindir}/etags.emacs 80 \ %dir %{_datadir}/emacs/%{version} %changelog +* Tue May 11 2010 Karel Klic - 1:23.2-2 +- Added a patch fixing m17n and libotf version checking (m17ncheck) + * Mon May 10 2010 Karel Klic - 1:23.2-1 - Updated the prerelase to final version