rpms/m17n-db/devel .cvsignore, 1.67, 1.68 m17n-db.spec, 1.103, 1.104 sources, 1.71, 1.72 m17n-gen-ibus-engine, 1.2, NONE si-wijesekera-keymap-rename_key-summary.patch, 1.2, NONE si-wijesekera_surrounding_to_preedit.patch, 1.2, NONE

Wed Apr 7 06:00:47 UTC 2010

Author: pnemade

Update of /cvs/pkgs/rpms/m17n-db/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv19314

Modified Files:
	.cvsignore m17n-db.spec sources 
Removed Files:
	m17n-gen-ibus-engine 
	si-wijesekera-keymap-rename_key-summary.patch 
	si-wijesekera_surrounding_to_preedit.patch 
Log Message:
* Wed Apr 07 2010 Parag Nemade <pnemade AT redhat.com> - 1.6.0-1
- update to new upstream release 1.6.0




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/m17n-db/devel/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68

--- .cvsignore	29 Jul 2009 03:53:47 -0000	1.67
+++ .cvsignore	7 Apr 2010 06:00:45 -0000	1.68
@@ -1 +1 @@
-m17n-db-1.5.5.tar.gz
+m17n-db-1.6.0.tar.gz


Index: m17n-db.spec
===================================================================
RCS file: /cvs/pkgs/rpms/m17n-db/devel/m17n-db.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- m17n-db.spec	23 Dec 2009 09:16:01 -0000	1.103
+++ m17n-db.spec	7 Apr 2010 06:00:45 -0000	1.104
@@ -1,7 +1,7 @@
 Name:       m17n-db
 Summary:    Multilingualization datafiles for m17n-lib
-Version:    1.5.5
-Release:    3%{?dist}
+Version:    1.6.0
+Release:    1%{?dist}
 Group:      System Environment/Libraries
 License:    LGPLv2+
 URL:        http://www.m17n.org/m17n-lib/index.html
@@ -10,26 +10,117 @@ BuildArch:  noarch
 Buildroot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gettext
 Patch1:     number_pad_itrans-222634.patch
-Patch2:     si-wijesekera-keymap-rename_key-summary.patch
-Patch4:     bn-itrans-t-182227.patch
-Patch5:     kn-itrans-ZWNJ-221965.patch
-Patch6:     kn-itrans_key-summary_228806.patch
-Patch7:     ml-itrans-keysummary-435260.patch
+Patch2:     bn-itrans-t-182227.patch
+Patch3:     kn-itrans-ZWNJ-221965.patch
+Patch4:     kn-itrans_key-summary_228806.patch
+Patch5:     ml-itrans-keysummary-435260.patch
+
+Obsoletes: m17n-db-khmer < 1.5.5-4
+Obsoletes: m17n-db-kannada < 1.5.5-4
+Obsoletes: m17n-db-sanskrit < 1.5.5-4
+Obsoletes: m17n-db-greek < 1.5.5-4 
+Obsoletes: m17n-db-croatian < 1.5.5-4
+Obsoletes: m17n-db-amharic < 1.5.5-4
+Obsoletes: m17n-db-tamil < 1.5.5-4
+Obsoletes: m17n-db-generic < 1.5.5-4
+Obsoletes: m17n-db-dhivehi < 1.5.5-4
+Obsoletes: m17n-db-assamese < 1.5.5-4
+Obsoletes: m17n-db-farsi < 1.5.5-4
+Obsoletes: m17n-db-punjabi < 1.5.5-4
+Obsoletes: m17n-db-lao < 1.5.5-4
+Obsoletes: m17n-db-korean < 1.5.5-4
+Obsoletes: m17n-db-oriya < 1.5.5-4
+Obsoletes: m17n-db-sinhala < 1.5.5-4
+Obsoletes: m17n-db-swedish < 1.5.5-4
+Obsoletes: m17n-db-devel < 1.5.5-4
+Obsoletes: m17n-db-armenian < 1.5.5-4
+Obsoletes: m17n-db-japanese < 1.5.5-4
+Obsoletes: m17n-db-thai < 1.5.5-4
+Obsoletes: m17n-db-bengali < 1.5.5-4
+Obsoletes: m17n-db-hindi < 1.5.5-4
+Obsoletes: m17n-db-syriac < 1.5.5-4 
+Obsoletes: m17n-db-danish < 1.5.5-4
+Obsoletes: m17n-db-gregorian < 1.5.5-4
+Obsoletes: m17n-db-malayalam < 1.5.5-4
+Obsoletes: m17n-db-common-cjk < 1.5.5-4
+Obsoletes: m17n-db-slovak < 1.5.5-4
+Obsoletes: m17n-db-latin < 1.5.5-4
+Obsoletes: m17n-db-serbian < 1.5.5-4
+Obsoletes: m17n-db-vietnamese < 1.5.5-4
+Obsoletes: m17n-db-kazakh < 1.5.5-4
+Obsoletes: m17n-db-telugu < 1.5.5-4
+Obsoletes: m17n-db-myanmar < 1.5.5-4
+Obsoletes: m17n-db-arabic < 1.5.5-4
+Obsoletes: m17n-db-gujarati < 1.5.5-4
+Obsoletes: m17n-db-french < 1.5.5-4
+Obsoletes: m17n-db-cham < 1.5.5-4
+Obsoletes: m17n-db-chinese < 1.5.5-4
+Obsoletes: m17n-db-uyghur < 1.5.5-4
+Obsoletes: m17n-db-russian < 1.5.5-4
+Obsoletes: m17n-db-hebrew < 1.5.5-4
+Obsoletes: m17n-db-tibetan < 1.5.5-4 
+Obsoletes: m17n-db-flt < 1.5.5-4
+
+Provides: m17n-db-khmer = %{version}-%{release}
+Provides: m17n-db-kannada = %{version}-%{release}
+Provides: m17n-db-sanskrit = %{version}-%{release}
+Provides: m17n-db-greek = %{version}-%{release}
+Provides: m17n-db-croatian = %{version}-%{release}
+Provides: m17n-db-amharic = %{version}-%{release}
+Provides: m17n-db-tamil = %{version}-%{release}
+Provides: m17n-db-generic = %{version}-%{release}
+Provides: m17n-db-dhivehi = %{version}-%{release}
+Provides: m17n-db-assamese = %{version}-%{release}
+Provides: m17n-db-farsi = %{version}-%{release}
+Provides: m17n-db-punjabi = %{version}-%{release}
+Provides: m17n-db-lao = %{version}-%{release}
+Provides: m17n-db-korean = %{version}-%{release}
+Provides: m17n-db-oriya = %{version}-%{release}
+Provides: m17n-db-sinhala = %{version}-%{release}
+Provides: m17n-db-swedish = %{version}-%{release}
+Provides: m17n-db-devel = %{version}-%{release}
+Provides: m17n-db-armenian = %{version}-%{release}
+Provides: m17n-db-japanese = %{version}-%{release}
+Provides: m17n-db-thai = %{version}-%{release}
+Provides: m17n-db-bengali = %{version}-%{release}
+Provides: m17n-db-hindi = %{version}-%{release}
+Provides: m17n-db-syriac = %{version}-%{release} 
+Provides: m17n-db-danish = %{version}-%{release}
+Provides: m17n-db-gregorian = %{version}-%{release}
+Provides: m17n-db-malayalam = %{version}-%{release}
+Provides: m17n-db-common-cjk = %{version}-%{release}
+Provides: m17n-db-slovak = %{version}-%{release}
+Provides: m17n-db-latin = %{version}-%{release}
+Provides: m17n-db-serbian = %{version}-%{release}
+Provides: m17n-db-vietnamese = %{version}-%{release}
+Provides: m17n-db-kazakh = %{version}-%{release}
+Provides: m17n-db-telugu = %{version}-%{release}
+Provides: m17n-db-myanmar = %{version}-%{release}
+Provides: m17n-db-arabic = %{version}-%{release}
+Provides: m17n-db-gujarati = %{version}-%{release}
+Provides: m17n-db-french = %{version}-%{release}
+Provides: m17n-db-cham = %{version}-%{release}
+Provides: m17n-db-chinese = %{version}-%{release}
+Provides: m17n-db-uyghur = %{version}-%{release}
+Provides: m17n-db-russian = %{version}-%{release}
+Provides: m17n-db-hebrew = %{version}-%{release}
+Provides: m17n-db-tibetan = %{version}-%{release}
+Provides: m17n-db-flt = %{version}-%{release}
 
 %description
 This package contains multilingualization (m17n) datafiles for m17n-lib
-which describe input maps, encoding maps, and OpenType font data
-for many languages.
+which describe input maps, encoding maps, OpenType font data and
+font layout text rendering for languages.
 
-
-%package datafiles
-Summary:  Multilingualization datafiles for m17n-lib
+%package extras
+Summary:  Extra m17n-db files
 Group:    System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
+Obsoletes: m17n-db-datafiles < 1.5.5-4
+Provides: m17n-db-datafiles = %{version}-%{release}
 
-%description datafiles
-m17n-db datafiles not needed for using the input maps.
-
+%description extras
+m17n-db extra files for input maps that are less used.
 
 %package devel
 Summary:  Development files for m17n-db
@@ -41,130 +132,14 @@ Requires: pkgconfig
 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.
-
-
-%package flt
-Summary:  m17n Font Layout Text data files
-Group:    System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description flt
-Font Layout Text rendering datafiles used by
-m17n-lib's flt library for complex text layout.
-
-
-%package generic
-Summary:  Generic m17n-db input maps
-Group:    System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description generic
-This package contains generic m17n-db input maps.
-
-
-# mk_pkg (name lang [icons] [cjk])
-%define mk_pkg() \
-%package %1\
-Summary:    m17n-db input maps for %(echo %1 | sed -e "s/\\(.*\\)/\\u\\1/")\
-Group:      System Environment/Libraries\
-Requires:   %{name} = %{version}-%{release}\
-%{?4:Requires: %{name}-common-cjk}\
-Obsoletes:  ibus-m17n-%1 < 0.1.1.20081013-3\
-\
-%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
-
-# mk_pkg_uses_contrib (name lang [icons])
-%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 \
-Obsoletes:  ibus-m17n-%1 < 0.1.1.20081013-3\
-\
-%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
-
-%mk_pkg amharic am 1
-%mk_pkg arabic ar 1
-%mk_pkg armenian hy 1
-%mk_pkg_uses_contrib assamese as 1
-%mk_pkg_uses_contrib bengali bn 1
-%mk_pkg cham cmc 1
-%mk_pkg chinese zh 1 1
-%{_datadir}/m17n/icons/bopo-*.png
-%mk_pkg croatian hr 1
-%mk_pkg danish da 0
-%mk_pkg dhivehi dv 1
-%mk_pkg farsi fa 1
-%mk_pkg french fr 0
-%mk_pkg gregorian ka 1
-%mk_pkg greek el 1
-%{_datadir}/m17n/grc-*.mim
-%mk_pkg_uses_contrib gujarati gu 1
-%mk_pkg hebrew he 1
-%mk_pkg_uses_contrib hindi hi 1
-%mk_pkg japanese ja 1
-%mk_pkg_uses_contrib kannada kn 1
-%mk_pkg kazakh kk 1
-%mk_pkg khmer km 1
-%mk_pkg korean ko 1 1
-%mk_pkg lao lo 1
-%mk_pkg latin latn 1
-%mk_pkg_uses_contrib malayalam ml 1
-%mk_pkg myanmar my 1
-%mk_pkg_uses_contrib oriya or 1
-%mk_pkg_uses_contrib punjabi pa 1
-%mk_pkg_uses_contrib russian ru 1
-%mk_pkg sanskrit sa 0
-%mk_pkg serbian sr 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_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_uses_contrib vietnamese vi 1
-
-
 %prep
-%setup -q
+%setup -q 
 pushd MIM
 %patch1 -p1 -b .1
-%patch2 -p0 -b .2
-%patch4 -p1 -b .4
+%patch2 -p1 -b .2
+%patch3 -p0 -b .3
+%patch4 -p0 -b .4
 %patch5 -p0 -b .5
-%patch6 -p0 -b .6
-%patch7 -p0 -b .7
 popd
 
 %build
@@ -174,14 +149,11 @@ make
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
 # don't ship unijoy map for now
 rm $RPM_BUILD_ROOT%{_datadir}/m17n/{bn-unijoy.mim,icons/bn-unijoy.png}
 
-# dont install si-wijesekera.mim as si-wijesekera-predit.mim works for us, see RH bug 208104
-rm $RPM_BUILD_ROOT%{_datadir}/m17n/si-wijesekera.mim
-
 # For installing the translation files
 %find_lang %name
 
@@ -190,19 +162,59 @@ rm $RPM_BUILD_ROOT%{_datadir}/m17n/si-wi
 rm -rf $RPM_BUILD_ROOT
 
 
-%files
-%defattr(-,root,root)
+%files 
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING README
 %dir %{_datadir}/m17n
 %dir %{_datadir}/m17n/icons
 %{_datadir}/m17n/mdb.dir
 %{_datadir}/m17n/*.tbl
-%{_datadir}/m17n/global.mim
-
+%{_datadir}/m17n/a*.mim
+%{_datadir}/m17n/b*.mim
+%{_datadir}/m17n/c*.mim
+%{_datadir}/m17n/d*.mim
+%{_datadir}/m17n/e*.mim
+%{_datadir}/m17n/f*.mim
+%{_datadir}/m17n/g*.mim
+%{_datadir}/m17n/h*.mim
+%{_datadir}/m17n/i*.mim
+%{_datadir}/m17n/k*.mim
+%{_datadir}/m17n/l*.mim
+%{_datadir}/m17n/m*.mim
+%{_datadir}/m17n/o*.mim
+%{_datadir}/m17n/p*.mim
+%{_datadir}/m17n/r*.mim
+%{_datadir}/m17n/s*.mim
+%{_datadir}/m17n/t*.mim
+%{_datadir}/m17n/u*.mim
+%{_datadir}/m17n/v*.mim
+
+%{_datadir}/m17n/icons/a*.png
+%{_datadir}/m17n/icons/b*.png
+%{_datadir}/m17n/icons/c*.png
+%{_datadir}/m17n/icons/d*.png
+%{_datadir}/m17n/icons/e*.png
+%{_datadir}/m17n/icons/f*.png
+%{_datadir}/m17n/icons/g*.png
+%{_datadir}/m17n/icons/h*.png
+%{_datadir}/m17n/icons/k*.png
+%{_datadir}/m17n/icons/l*.png
+%{_datadir}/m17n/icons/m*.png
+%{_datadir}/m17n/icons/o*.png
+%{_datadir}/m17n/icons/p*.png
+%{_datadir}/m17n/icons/r*.png
+%{_datadir}/m17n/icons/s*.png
+%{_datadir}/m17n/icons/t*.png
+%{_datadir}/m17n/icons/u*.png
+%{_datadir}/m17n/icons/v*.png
+%{_datadir}/m17n/*.flt
 
-# include translations
-%files datafiles -f %{name}.lang
-%defattr(-,root,root)
+%files extras -f %{name}.lang
+%defattr(-,root,root,-)
+%{_datadir}/m17n/zh-*.mim
+%{_datadir}/m17n/icons/zh*.png
+%{_datadir}/m17n/ja*.mim
+%{_datadir}/m17n/icons/ja*.png
 %{_datadir}/m17n/*.fst
 %{_datadir}/m17n/*.map
 %{_datadir}/m17n/*.tab
@@ -210,29 +222,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/m17n/LOCALE.*
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_bindir}/m17n-db
 %{_datadir}/pkgconfig/m17n-db.pc
 
-%files common-cjk
-%defattr(-,root,root)
-%{_datadir}/m17n/cjk-*.mim
-
-%files flt
-%defattr(-,root,root)
-%{_datadir}/m17n/*.flt
-
-%files generic
-%defattr(-,root,root)
-%{_datadir}/m17n/ispell.mim
-%{_datadir}/m17n/icons/en-ispell.png
-%{_datadir}/m17n/rfc1345.mim
-%{_datadir}/m17n/icons/rfc1345.png
-%{_datadir}/m17n/unicode.mim
-%{_datadir}/m17n/icons/unicode.png
-
-
 %changelog
+* Wed Apr 07 2010 Parag Nemade <pnemade AT redhat.com> - 1.6.0-1
+- update to new upstream release 1.6.0
+
 * Wed Dec 23 2009 Jens Petersen <petersen at redhat.com> - 1.5.5-3
 - separate .flt files to flt subpackage for m17n-lib-flt
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/m17n-db/devel/sources,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- sources	29 Jul 2009 03:53:47 -0000	1.71
+++ sources	7 Apr 2010 06:00:47 -0000	1.72
@@ -1 +1 @@
-a6fa9486caed6fe2a09d89fe97787696  m17n-db-1.5.5.tar.gz
+f8dc1ad76ff8e9c255cf273aae85a7ff  m17n-db-1.6.0.tar.gz


--- m17n-gen-ibus-engine DELETED ---


--- si-wijesekera-keymap-rename_key-summary.patch DELETED ---


--- si-wijesekera_surrounding_to_preedit.patch DELETED ---

