From 2c859feb50047d47f7f1e03fd649b96aa6eb25ef Mon Sep 17 00:00:00 2001
From: Karel Klíč <kklic@fedoraproject.org>
Date: May 11 2010 12:11:55 +0000
Subject: Update to 23.2


---

diff --git a/.cvsignore b/.cvsignore
index 2862644..f7f521a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-emacs-23.1.96.tar.gz
+emacs-23.2.tar.bz2
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 f3876c5..ed750ee 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -3,13 +3,12 @@
 Summary: GNU Emacs text editor
 Name: emacs
 Epoch: 1
-Version: 23.1.96
-Release: 2%{?dist}
+Version: 23.2
+Release: 1%{?dist}
 License: GPLv3+
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
-#Source0: ftp://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.bz2
-Source0: ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-%{version}.tar.gz
+Source0: ftp://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.bz2
 Source1: emacs.desktop
 Source3: dotemacs.el
 Source4: site-start.el
@@ -28,6 +27,8 @@ Patch1: rpm-spec-mode.patch
 Patch2: po-mode-auto-replace-date-71264.patch
 Patch3: rpm-spec-mode-utc.patch
 Patch4: emacs-23.1-xdg.patch
+# Accepted by 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
@@ -133,6 +134,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 %SOURCE14 site-lisp
@@ -393,6 +395,10 @@ alternatives --install %{_bindir}/etags emacs.etags %{_bindir}/etags.emacs 80 \
 %dir %{_datadir}/emacs/%{version}
 
 %changelog
+* Tue May 11 2010 Karel Klic <kklic@redhat.com> - 1:23.2-1
+- Updated the prerelase to final version
+- Added a patch fixing m17n and libotf version checking (m17ncheck)
+
 * Sun Apr 25 2010 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 1:23.1.96-2
 - Add BuildRequires for GConf2-devel to build in Gconf2 support (RHBZ #585447)
 
diff --git a/sources b/sources
index 4846e5a..0f8c363 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-25b607668980a96f563ce6be12a6d353  emacs-23.1.96.tar.gz
+057a0379f2f6b85fb114d8c723c79ce2  emacs-23.2.tar.bz2