From cf04f18aaa03a8b33dab37871c6a7084f2bbc3da Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@fedoraproject.org>
Date: Fri, 10 Feb 2006 02:53:33 +0000
Subject: [PATCH] - update to 1.3.2 release - m17n-lib-no-gui-headers.patch is
 now upstream

---
 .cvsignore    |  2 +-
 m17n-lib.spec | 14 ++++++++++----
 sources       |  2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 7834387..e6e6bdf 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-m17n-lib-1.3.1.tar.gz
+m17n-lib-1.3.2.tar.gz
diff --git a/m17n-lib.spec b/m17n-lib.spec
index 8c2dafc..54c8061 100644
--- a/m17n-lib.spec
+++ b/m17n-lib.spec
@@ -4,8 +4,13 @@
 %define with_examples 0
 
 Name:		m17n-lib
+<<<<<<< m17n-lib.spec
+Version:	1.3.2
+Release:	1%{?dist}
+=======
 Version:	1.3.1
 Release:	1%{?dist}.1
+>>>>>>> 1.4
 Summary:	Multilingual text library
 
 Group:		System Environment/Libraries
@@ -26,7 +31,6 @@ BuildRequires:	autoconf
 BuildRequires:	anthy-devel
 %endif
 Requires:	m17n-db
-Patch1:		m17n-lib-no-gui-headers.patch
 Patch2:		m17n-lib-nobuild-examples.patch
 
 %description
@@ -45,12 +49,10 @@ Development files for %{name}.
 
 %prep
 %setup -q
-%if ! %{with_gui}
-%patch1 -p0 -b .gui
-%endif
 %if ! %{with_examples}
 %patch2 -p1 -b .examples
 %endif
+# patch2 touches Makefile.am
 autoreconf
 
 
@@ -96,6 +98,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Feb 10 2006 Jens Petersen <petersen@redhat.com> - 1.3.2-1
+- update to 1.3.2 release
+  - m17n-lib-no-gui-headers.patch is now upstream
+
 * Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 1.3.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
diff --git a/sources b/sources
index 6c076d2..ee449c0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9a82742760f43d18861b6026b4321093  m17n-lib-1.3.1.tar.gz
+4e20041711545a4d85fd46c9a5d8f0d5  m17n-lib-1.3.2.tar.gz