From 9b42fecea18b60266e2142280bd9840d94cd213e Mon Sep 17 00:00:00 2001
From: Parag Nemade <pnemade@redhat.com>
Date: Tue, 5 Oct 2010 13:52:16 +0530
Subject: [PATCH] - update to new upstream release 1.6.2

---
 .gitignore    |  1 +
 m17n-lib.spec | 78 ++++++++++++++++++++++++---------------------------
 sources       |  2 +-
 3 files changed, 38 insertions(+), 43 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2796722..b6be1b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 m17n-lib-1.6.1.tar.gz
+/m17n-lib-1.6.2.tar.gz
diff --git a/m17n-lib.spec b/m17n-lib.spec
index d71b673..cf09c86 100644
--- a/m17n-lib.spec
+++ b/m17n-lib.spec
@@ -1,13 +1,9 @@
-%bcond_without otf
-
 # note this duplicates native anthy IMEs
 %bcond_without anthy
-# use --with gui to build GUI library
-%bcond_with gui
 
 Name:    m17n-lib
-Version:  1.6.1
-Release:  3%{?dist}
+Version:  1.6.2
+Release:  1%{?dist}
 Summary:  Multilingual text library
 
 Group:    System Environment/Libraries
@@ -15,22 +11,17 @@ License:  LGPLv2
 URL:    http://www.m17n.org/m17n-lib/index.html
 Source0:  http://www.m17n.org/m17n-lib-download/%{name}-%{version}.tar.gz
 Patch0:  m17n-lib-1.6.1-multilib.patch
-BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  m17n-db-devel >= 1.6.0
+BuildRequires:  m17n-db-devel libthai
 %if %{with anthy}
 BuildRequires:  anthy-devel
 %endif
-%if %{with gui}
 BuildRequires:  libxml2-devel, libXft-devel, fontconfig-devel
-BuildRequires:  freetype-devel >= 2.0, fribidi-devel, gd-devel >= 2.0, libXaw-devel
-# ispell seems to depend on gui
+BuildRequires:  freetype-devel , fribidi-devel, gd-devel, libXaw-devel
+# ispell seems to depend on tools
 BuildRequires:  aspell
-%endif
-%if %{with otf}
 BuildRequires:  libotf-devel
-%endif
-Requires:  m17n-db = %{version}
-Obsoletes: m17n-lib-flt < 1.6.0-1.fc13
+Requires:  m17n-db
+Obsoletes: m17n-lib-flt < 1.6.0-1.fc14
 Provides: m17n-lib-flt = %{version}-%{release}
 
 
@@ -54,19 +45,19 @@ Group:    Development/Libraries
 Requires:  %{name} = %{version}-%{release}
 Requires:  %{name}-flt = %{version}-%{release}
 Requires:  %{name}-anthy = %{version}-%{release}
+Requires:  %{name}-tools = %{version}-%{release}
 
 %description devel
 Development files for %{name}.
 
 
-%if %{with gui}
-%package  gui
-Summary:  m17n GUI Library
+%package  tools
+Summary:  m17n GUI Library tools
 Group:    System Environment/Libraries
-Requires: m17n-db-datafiles
+Requires: m17n-db-extras
 
-%description gui
-M17n GUI widget library.
+%description tools
+Tools to test M17n GUI widget library.
 
 
 %package  ispell
@@ -75,7 +66,6 @@ Group:    System Environment/Libraries
 
 %description ispell
 Ispell module for m17n input.
-%endif
 
 
 %prep
@@ -83,33 +73,26 @@ Ispell module for m17n input.
 %patch0 -p0
 
 %build
-%configure --disable-rpath --disable-static %{!?with_gui:--without-gui}
+%configure --disable-rpath --disable-static
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
-# remove unneeded files
-rm $RPM_BUILD_ROOT%{_libdir}/lib*.la
-rm $RPM_BUILD_ROOT%{_libdir}/m17n/1.0/libmimx-anthy.la
-%if %{without anthy}
-rm $RPM_BUILD_ROOT%{_libdir}/m17n/1.0/libmimx-anthy*
-%endif
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 
+%post tools -p /sbin/ldconfig
+
+%postun tools -p /sbin/ldconfig
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS
@@ -130,24 +113,35 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*
 
-%if %{with gui}
-%files gui
+%files tools
 %defattr(-,root,root,-)
 %{_bindir}/m17n-date
 %{_bindir}/m17n-dump
 %{_bindir}/m17n-edit
 %{_bindir}/m17n-view
-%{_libdir}/libm17n-X.so.*
-%{_libdir}/libm17n-gd.so.*
+%{_libdir}/m17n/1.0/libm17n-X.so
+%{_libdir}/m17n/1.0/libm17n-gd.so
 %{_libdir}/libm17n-gui.so.*
 
 %files ispell
 %defattr(-,root,root,-)
-%{_libdir}/libmimx-ispell.so.*
-%endif
+%{_libdir}/m17n/1.0/libmimx-ispell.so
 
 
 %changelog
+* Wed Oct 06 2010 Parag Nemade <pnemade AT redhat.com> - 1.6.2-1
+- update to new upstream release 1.6.2
+
+* Mon Sep 13 2010 Parag Nemade <pnemade AT redhat.com> - 1.6.1-5
+- Fix some packaging issue
+- Change Requires: m17n-db-datafiles to m17n-db-extras
+
+* Fri Sep 10 2010 Daiki Ueno <dueno@redhat.com> - 1.6.1-4
+- supply libotf cflags/libs manually, since the current libotf package
+  does not ship with "libotf-config" and m17n-lib cannot detect those
+  values
+- fix paths for modules used by GUI support
+
 * Wed Aug 11 2010 Adam Jackson <ajax@redhat.com> 1.6.1-3
 - Fix Obsoletes: so upgrades actually work (1.5.5-3 < 1.5.5-3.fc13)
 
diff --git a/sources b/sources
index b92ff4c..c02b235 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3a0ee7b65eefa0042a7efd3d855104f2  m17n-lib-1.6.1.tar.gz
+ad889ed85d4c24928e52f9865bc224ce  m17n-lib-1.6.2.tar.gz