[m17n-lib/f14/master] - Fix some packaging issue - Change Requires: m17n-db-datafiles to m17n-db-extras

[pnemade]

commit 395055fa0c4439ca672ae7fc9331a713a8d5dc64
Author: Parag Nemade <pnemade at redhat.com>
Date:   Mon Sep 13 15:50:07 2010 +0530

    - Fix some packaging issue
    - Change Requires: m17n-db-datafiles to m17n-db-extras

 m17n-lib.spec |   26 +++++++++-----------------
 1 files changed, 9 insertions(+), 17 deletions(-)
---
diff --git a/m17n-lib.spec b/m17n-lib.spec
index 382351b..a3eec13 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 tools to build GUI library and tools to test it.
-%bcond_without tools
 
 Name:    m17n-lib
 Version:  1.6.1
-Release:  4%{?dist}
+Release:  5%{?dist}
 Summary:  Multilingual text library
 
 Group:    System Environment/Libraries
@@ -15,19 +11,15 @@ 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
-BuildRequires:  m17n-db-devel >= 1.6.0
+BuildRequires:  m17n-db-devel libthai
 %if %{with anthy}
 BuildRequires:  anthy-devel
 %endif
-%if %{with tools}
 BuildRequires:  libxml2-devel, libXft-devel, fontconfig-devel
-BuildRequires:  freetype-devel >= 2.0, fribidi-devel, gd-devel >= 2.0, libXaw-devel
+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
 Provides: m17n-lib-flt = %{version}-%{release}
@@ -59,11 +51,10 @@ Requires:  %{name}-tools = %{version}-%{release}
 Development files for %{name}.
 
 
-%if %{with tools}
 %package  tools
 Summary:  m17n GUI Library tools
 Group:    System Environment/Libraries
-Requires: m17n-db-datafiles
+Requires: m17n-db-extras
 
 %description tools
 Tools to test M17n GUI widget library.
@@ -75,7 +66,6 @@ Group:    System Environment/Libraries
 
 %description ispell
 Ispell module for m17n input.
-%endif
 
 
 %prep
@@ -90,7 +80,7 @@ CPPFLAGS=`pkg-config libotf --cflags`
 export CPPFLAGS
 LIBS=`pkg-config libotf --libs`
 export LIBS
-%configure --disable-rpath --disable-static %{!?with_tools:--without-tools}
+%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
@@ -130,7 +120,6 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*
 
-%if %{with tools}
 %files tools
 %defattr(-,root,root,-)
 %{_bindir}/m17n-date
@@ -144,10 +133,13 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 %files ispell
 %defattr(-,root,root,-)
 %{_libdir}/m17n/1.0/libmimx-ispell.so
-%endif
 
 
 %changelog
+* 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 at 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