rpms/m17n-db/devel m17n-db.spec,1.98,1.99

[Parag Nemade]

Author: pnemade

Update of /cvs/pkgs/rpms/m17n-db/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10567

Modified Files:
	m17n-db.spec 
Log Message:

* Wed Apr 08 2009 Parag Nemade <pnemade at redhat.com> -1.5.4-2
- Resolves: rh#494810-[indic][m17n-db][m17n-contrib] ibus .engine files no longer needed for new ibus




Index: m17n-db.spec
===================================================================
RCS file: /cvs/pkgs/rpms/m17n-db/devel/m17n-db.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- m17n-db.spec	3 Mar 2009 05:49:50 -0000	1.98
+++ m17n-db.spec	8 Apr 2009 09:19:59 -0000	1.99
@@ -1,12 +1,11 @@
 Name:       m17n-db
 Summary:    Multilingualization datafiles for m17n-lib
 Version:    1.5.4
-Release:    1%{?dist}
+Release:    2%{?dist}
 Group:      System Environment/Libraries
 License:    LGPLv2+
 URL:        http://www.m17n.org/m17n-lib/index.html
 Source0:    http://www.m17n.org/m17n-lib-download/%{name}-%{version}.tar.gz
-Source1:    m17n-gen-ibus-engine
 BuildArch:  noarch
 Buildroot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gettext
@@ -119,7 +118,6 @@
 %else\
 %{nil}\
 %endif\
-%{_datadir}/ibus/engine/m17n-%2-*.engine
 
 %define mk_pkg_uses_contrib() \
 %package %1\
@@ -140,7 +138,6 @@
 %else\
 %{nil}\
 %endif\
-%{_datadir}/ibus/engine/m17n-%2-*.engine
 
 %mk_pkg amharic am 1
 %mk_pkg arabic ar 1
@@ -201,7 +198,6 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-install -p %SOURCE1 .
 # don't need ispell or anthy
 rm $RPM_BUILD_ROOT%{_datadir}/m17n/{ispell.mim,icons/en-ispell.png}
 rm $RPM_BUILD_ROOT%{_datadir}/m17n/{ja-anthy.mim,icons/ja-anthy.png}
@@ -211,16 +207,6 @@
 # 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
 
-
-# generate .engine files for ibus-m17n for now
-install -p --mode=0755 %SOURCE1 $RPM_BUILD_ROOT%{_bindir}
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/ibus/engine
-for i in $RPM_BUILD_ROOT%{_datadir}/m17n/*.mim; do
-  $RPM_BUILD_ROOT%{_bindir}/m17n-gen-ibus-engine $i $RPM_BUILD_ROOT%{_datadir}/ibus/engine
-done
-# these are not real engines
-rm -f $RPM_BUILD_ROOT%{_datadir}/ibus/engine/m17n-{cjk-util,global}.engine
-
 # For installing the translation files
 %find_lang %name
 
@@ -237,8 +223,6 @@
 %{_datadir}/m17n/mdb.dir
 %{_datadir}/m17n/*.tbl
 %{_datadir}/m17n/global.mim
-%dir %{_datadir}/ibus
-%dir %{_datadir}/ibus/engine
 
 
 # include translations
@@ -254,7 +238,6 @@
 %files devel
 %defattr(-,root,root)
 %{_bindir}/m17n-db
-%{_bindir}/m17n-gen-ibus-engine
 %{_datadir}/pkgconfig/m17n-db.pc
 
 %files common-cjk
@@ -266,38 +249,34 @@
 %{_datadir}/m17n/zh-*.mim
 %{_datadir}/m17n/icons/zh-*.png
 %{_datadir}/m17n/icons/bopo-*.png
-%{_datadir}/ibus/engine/m17n-zh-*.engine
 
 %files generic
 %defattr(-,root,root)
 %{_datadir}/m17n/rfc1345.mim
 %{_datadir}/m17n/icons/rfc1345.png
-%{_datadir}/ibus/engine/m17n-rfc1345.engine
 %{_datadir}/m17n/unicode.mim
 %{_datadir}/m17n/icons/unicode.png
-%{_datadir}/ibus/engine/m17n-unicode.engine
 
 %files greek
 %defattr(-,root,root)
 %{_datadir}/m17n/el-*.mim
 %{_datadir}/m17n/grc-*.mim
 %{_datadir}/m17n/icons/el-*.png
-%{_datadir}/ibus/engine/m17n-el-*.engine
-%{_datadir}/ibus/engine/m17n-grc-*.engine
 
 %files gregorian
 %defattr(-,root,root)
 %{_datadir}/m17n/ka*.mim
 %{_datadir}/m17n/icons/ka*.png
-%{_datadir}/ibus/engine/m17n-ka*.engine
 
 %files uyghur
 %defattr(-,root,root)
 %dir %{_datadir}/m17n
 %{_datadir}/m17n/ug-*.mim
-%{_datadir}/ibus/engine/m17n-ug-*.engine
 
 %changelog
+* Wed Apr 08 2009 Parag Nemade <pnemade at redhat.com> -1.5.4-2
+- Resolves: rh#494810-[indic][m17n-db][m17n-contrib] ibus .engine files no longer needed for new ibus
+
 * Tue Mar 03 2009 Parag Nemade <pnemade at redhat.com> -1.5.4-1
 - Update to new upstream release 1.5.4