From 9b9b571430e0e9d96a7c880376421c50ae420b73 Mon Sep 17 00:00:00 2001
From: Karel Klic <kklic@redhat.com>
Date: Mar 10 2011 12:54:22 +0000
Subject: New upstream release


---

diff --git a/emacs-23.2-m17ncheck.patch b/emacs-23.2-m17ncheck.patch
deleted file mode 100644
index 28e1f60..0000000
--- a/emacs-23.2-m17ncheck.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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-23.2-spacing.patch b/emacs-23.2-spacing.patch
deleted file mode 100644
index ac8fd8f..0000000
--- a/emacs-23.2-spacing.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/src/ftfont.c b/src/ftfont.c
-index 4ebc4be..bac9a4f 100644
---- a/src/ftfont.c
-+++ b/src/ftfont.c
-@@ -1262,7 +1262,7 @@ ftfont_open (f, entity, pixel_size)
-     spacing = XINT (AREF (entity, FONT_SPACING_INDEX));
-   else
-     spacing = FC_PROPORTIONAL;
--  if (spacing != FC_PROPORTIONAL)
-+  if (spacing != FC_PROPORTIONAL && spacing != FC_DUAL)
-     font->min_width = font->average_width = font->space_width
-       = (scalable ? ft_face->max_advance_width * size / upEM
- 	 : ft_face->size->metrics.max_advance >> 6);
-diff --git a/src/xftfont.c b/src/xftfont.c
-index 82701ce..e74ce31 100644
---- a/src/xftfont.c
-+++ b/src/xftfont.c
-@@ -418,7 +418,7 @@ xftfont_open (f, entity, pixel_size)
- 	ascii_printable[i] = ' ' + i;
-     }
-   BLOCK_INPUT;
--  if (spacing != FC_PROPORTIONAL)
-+  if (spacing != FC_PROPORTIONAL && spacing != FC_DUAL)
-     {
-       font->min_width = font->average_width = font->space_width
- 	= xftfont->max_advance_width;
diff --git a/emacs.spec b/emacs.spec
index 7c8a5bd..bf4f61b 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -2,8 +2,8 @@
 Summary: GNU Emacs text editor
 Name: emacs
 Epoch: 1
-Version: 23.2
-Release: 18%{?dist}
+Version: 23.3
+Release: 1%{?dist}
 License: GPLv3+
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -28,13 +28,9 @@ Patch1: rpm-spec-mode.patch
 Patch3: rpm-spec-mode-utc.patch
 # Upstream implemented the change in revno. 101105
 Patch4: emacs-23.1-xdg.patch
-# Accepted by upstream.
-Patch5: emacs-23.2-m17ncheck.patch
 # Fix rhbz#595546
 # Upstream: http://emacsbugs.donarmstrong.com/cgi/bugreport.cgi?bug=6158
 Patch6: emacs-23.2-hideshow-comment.patch
-# Reported upstream http://debbugs.gnu.org/cgi/bugreport.cgi?bug=4129
-Patch7: emacs-23.2-spacing.patch
 BuildRequires: atk-devel, cairo-devel, 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
 BuildRequires: libXpm-devel, ncurses-devel, xorg-x11-proto-devel, zlib-devel
@@ -149,9 +145,7 @@ packages that add functionality to Emacs.
 
 %patch0 -p1 -b .glibc-open-macro
 %patch4 -p1 -b .xdg
-%patch5 -p1 -b .m17ncheck
 %patch6 -p0 -b .hideshow-comment
-%patch7 -p1 -b .spacing
 
 # Install site-lisp files
 cp %SOURCE7 %SOURCE9 %SOURCE10 site-lisp
@@ -438,6 +432,9 @@ update-desktop-database &> /dev/null || :
 %dir %{_datadir}/emacs/site-lisp/site-start.d
 
 %changelog
+* Thu Mar 10 2011 Karel Klic <kklic@redhat.com> - 1:23.3-1
+- New upstream release
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:23.2-18
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild