- Added m17n-db as Requires for mk_pkg() macro generating packages.

- Added m17b-db and m17n-contrib-lang as Requires for mk_pkg_uses_contrib()
    macro generating packages.

m17n-db.spec

@@ -1,7 +1,7 @@
 Name:       m17n-db
 Summary:    Multilingualization datafiles for m17n-lib
 Version:    1.4.0
-Release:    3%{?dist}
+Release:    4%{?dist}
 Group:      System Environment/Libraries
 License:    LGPL
 URL:        http://www.m17n.org/m17n-lib/index.html
@@ -24,6 +24,7 @@ for many languages.
 %package datafiles
 Summary:  Multilingualization datafiles for m17n-lib
 Group:    System Environment/Libraries
+Requires: %{name} = %{version}-%{release} 
 
 %description datafiles
 m17n-db datafiles not needed for using the input maps.
@@ -42,6 +43,7 @@ m17n-db development files
 %package common-cjk
 Summary:  Common m17n-db files for CJK input
 Group:    System Environment/Libraries
+Requires: %{name} = %{version}-%{release} 
 
 %description common-cjk
 m17n-db common files for Chinese, Japanese and Korean input maps.
@@ -60,6 +62,7 @@ m17n-db Chinese input map.
 %package generic
 Summary:  Generic m17n-db input tables
 Group:    System Environment/Libraries
+Requires: %{name} = %{version}-%{release} 
 
 %description generic
 This package contains generic m17n-db input tables.
@@ -68,6 +71,7 @@ This package contains generic m17n-db input tables.
 %package greek
 Summary:  Greek m17n-db input tables
 Group:    System Environment/Libraries
+Requires: %{name} = %{version}-%{release} 
 
 %description greek
 m17n-db Greek input table.
@@ -77,6 +81,26 @@ m17n-db Greek input table.
 %package %1\
 Summary:    m17n-db input maps for %(echo %1 | sed -e "s/\\(.*\\)/\\u\\1/")\
 Group:      System Environment/Libraries\
+Requires: %{name} = %{version}-%{release}  \
+\
+%description %1\
+This package contains m17n-db input maps for %(echo %1 | sed -e "s/\\(.*\\)/\\u\\1/").\
+\
+%files %1\
+%defattr(-,root,root)\
+%{_datadir}/m17n/%2-*.mim\
+%if %3\
+%{_datadir}/m17n/icons/%2-*.png\
+%else\
+%{nil}\
+%endif
+
+%define mk_pkg_uses_contrib() \
+%package %1\
+Summary:    m17n-db input maps for %(echo %1 | sed -e "s/\\(.*\\)/\\u\\1/")\
+Group:      System Environment/Libraries\
+Requires: %{name} = %{version}-%{release} \
+Requires:   m17n-contrib-%1 >= 1.1.3 \
 \
 %description %1\
 This package contains m17n-db input maps for %(echo %1 | sed -e "s/\\(.*\\)/\\u\\1/").\
@@ -93,39 +117,39 @@ This package contains m17n-db input maps for %(echo %1 | sed -e "s/\\(.*\\)/\\u\
 %mk_pkg amharic am 1
 %mk_pkg arabic ar 1
 %mk_pkg armenian hy 1
-%mk_pkg assamese as 1
-%mk_pkg bengali bn 1
+%mk_pkg_uses_contrib assamese as 1
+%mk_pkg_uses_contrib bengali bn 1
 %mk_pkg croatian hr 1
 %mk_pkg dhivehi dv 1
 %mk_pkg farsi fa 1
 %mk_pkg french fr 0
 %mk_pkg gregorian ka 1
-%mk_pkg gujarati gu 1
+%mk_pkg_uses_contrib gujarati gu 1
 %mk_pkg hebrew he 1
-%mk_pkg hindi hi 1
+%mk_pkg_uses_contrib hindi hi 1
 %mk_pkg japanese ja 1
-%mk_pkg kannada kn 1
+%mk_pkg_uses_contrib kannada kn 1
 %mk_pkg kazakh kk 1 
 %mk_pkg khmer km 1 
 %mk_pkg korean ko 1
 %mk_pkg lao lo 1
 %mk_pkg latin latn 1
-%mk_pkg malayalam ml 1
+%mk_pkg_uses_contrib malayalam ml 1
 %mk_pkg myanmar my 1
-%mk_pkg oriya or 1
-%mk_pkg punjabi pa 1
-%mk_pkg russian ru 1
+%mk_pkg_uses_contrib oriya or 1
+%mk_pkg_uses_contrib punjabi pa 1
+%mk_pkg_uses_contrib russian ru 1
 %mk_pkg serbian sr 1
-%mk_pkg sinhala si 1
+%mk_pkg_uses_contrib sinhala si 1
 %mk_pkg slovak sk 1
 %mk_pkg swedish sv 1
 %mk_pkg syriac syrc 1
-%mk_pkg tamil ta 1
-%mk_pkg telugu te 1
+%mk_pkg_uses_contrib tamil ta 1
+%mk_pkg_uses_contrib telugu te 1
 %mk_pkg thai th 1
 %mk_pkg tibetan bo 1
 %mk_pkg uyghur ug 0
-%mk_pkg vietnamese vi 1
+%mk_pkg_uses_contrib vietnamese vi 1
 
 
 %prep
@@ -221,6 +245,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Jul 25 2007 Parag Nemade <pnemade@redhat.com> - 1.4.0-4
+- Added m17n-db as Requires for mk_pkg() macro generating packages.
+- Added m17b-db and m17n-contrib-lang as Requires 
+  for mk_pkg_uses_contrib() macro generating packages.
+
 * Wed Jul 25 2007 Jens Petersen <petersen@redhat.com> - 1.4.0-3
 - cleanup summaries and descriptions
 - make just main package own m17n and icons dir