rpms/m17n-db/F-9 m17n-gen-ibus-engine, NONE, 1.1 .cvsignore, 1.63, 1.64 m17n-db.spec, 1.87, 1.88 si-wijesekera-keymap-rename_key-summary.patch, 1.1, 1.2 sources, 1.67, 1.68

Fri Nov 7 07:26:16 UTC 2008

Author: petersen

Update of /cvs/extras/rpms/m17n-db/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29462

Modified Files:
	.cvsignore m17n-db.spec 
	si-wijesekera-keymap-rename_key-summary.patch sources 
Added Files:
	m17n-gen-ibus-engine 
Log Message:
backport from f10:

* Tue Oct 21 2008 Parag Nemade <pnemade at redhat.com> -1.5.3-1.fc10
- Update to new upstream release 1.5.3

* Mon Oct 20 2008 Jens Petersen <petersen at redhat.com> - 1.5.2-4.fc10
- add obsoletes for ibus-m17n subpackages
- fix m17n-gen-ibus-engine to check for lang 't'

* Wed Oct 15 2008 Jens Petersen <petersen at redhat.com> - 1.5.2-3.fc10
- create .engine files for ibus-m17n with m17n-gen-ibus-engine (#466410)

--- NEW FILE m17n-gen-ibus-engine ---
#!/bin/sh
# generates .engine files from m17n .mim files for ibus-m17n

PROG=`basename $0`

if [ $# -le 1 ]; then
    echo "Usage: $PROG <m17n-mim-file> [output-dir]"
    exit 1
fi

FILE=$1
OUTDIR=${2:-.}

MAP=$(basename $1 .mim)

LANG=$(echo $MAP | sed -e "s/-.*//")
if grep -q "(input-method t " $FILE; then
  LANG=$MAP
fi
if [ "$LANG" = "$MAP" ]; then
  STYLE=$LANG
  LANG=t
else
  STYLE=$(echo $MAP | sed -e "s/^.*-//")
fi
cat > $OUTDIR/m17n-$MAP.engine << EOF
Exec=/usr/bin/ibus-engine-m17n $LANG:$STYLE
Name=$STYLE
Lang=$LANG
Icon=/usr/share/m17n/icons/$MAP.png
Author=
Credits=
EOF


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/m17n-db/F-9/.cvsignore,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- .cvsignore	7 Feb 2008 05:59:01 -0000	1.63
+++ .cvsignore	7 Nov 2008 07:25:45 -0000	1.64
@@ -23,3 +23,5 @@
 m17n-contrib-1.1.2.tar.gz
 m17n-db-1.5.0.tar.gz
 m17n-db-1.5.1.tar.gz
+m17n-db-1.5.2.tar.gz
+m17n-db-1.5.3.tar.gz


Index: m17n-db.spec
===================================================================
RCS file: /cvs/extras/rpms/m17n-db/F-9/m17n-db.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- m17n-db.spec	4 Apr 2008 10:14:07 -0000	1.87
+++ m17n-db.spec	7 Nov 2008 07:25:45 -0000	1.88
@@ -1,11 +1,12 @@
 Name:       m17n-db
 Summary:    Multilingualization datafiles for m17n-lib
-Version:    1.5.1
-Release:    3%{?dist}
+Version:    1.5.3
+Release:    1%{?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
@@ -14,7 +15,7 @@
 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
+Patch7:     ml-itrans-keysummary-435260.patch
 
 %description
 This package contains multilingualization (m17n) datafiles for m17n-lib
@@ -55,7 +56,7 @@
 Group:    System Environment/Libraries
 Requires: %{name}-common-cjk
 Obsoletes: %{name}-bopomofo < 1.3.3-13.fc6
-Provides:  %{name}-bopomofo = %{version}-%{release}
+Obsoletes: ibus-m17n-chinese < 0.1.1.20081013-3
 
 %description chinese
 m17n-db Chinese input map.
@@ -74,6 +75,7 @@
 Summary:  Greek m17n-db input maps
 Group:    System Environment/Libraries
 Requires: %{name} = %{version}-%{release} 
+Obsoletes: ibus-m17n-greek < 0.1.1.20081013-3
 
 %description greek
 m17n-db Greek input table.
@@ -84,7 +86,7 @@
 Group:    System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
 Obsoletes: m17n-db-georgian <= 1.4.0
-Provides:  m17n-db-georgian  = %{version}-%{release}
+Obsoletes: ibus-m17n-gregorian < 0.1.1.20081013-3
 
 %description gregorian
 m17n-db Gregorian input table.
@@ -94,7 +96,7 @@
 Group:    System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
 Obsoletes: m17n-db-Uyghur <= 1.4.0
-Provides:  m17n-db-Uyghur = %{version}-%{release}
+Obsoletes: ibus-m17n-uyghur < 0.1.1.20081013-3
 
 %description uyghur
 m17n-db uyghur input table.
@@ -103,7 +105,8 @@
 %package %1\
 Summary:    m17n-db input maps for %(echo %1 | sed -e "s/\\(.*\\)/\\u\\1/")\
 Group:      System Environment/Libraries\
-Requires: %{name} = %{version}-%{release}  \
+Requires:   %{name} = %{version}-%{release}\
+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/").\
@@ -115,14 +118,16 @@
 %{_datadir}/m17n/icons/%2-*.png\
 %else\
 %{nil}\
-%endif
+%endif\
+%{_datadir}/ibus/engine/m17n-%2-*.engine
 
 %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:   %{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/").\
@@ -134,7 +139,8 @@
 %{_datadir}/m17n/icons/%2-*.png\
 %else\
 %{nil}\
-%endif
+%endif\
+%{_datadir}/ibus/engine/m17n-%2-*.engine
 
 %mk_pkg amharic am 1
 %mk_pkg arabic ar 1
@@ -176,16 +182,14 @@
 
 %prep
 %setup -q 
-cd MIM
+pushd MIM
 %patch1 -p1 -b .1
 %patch2 -p0 -b .2
-cd ..
-%patch4 -p0 -b .4
-cd MIM
+%patch4 -p1 -b .4
 %patch5 -p0 -b .5
 %patch6 -p0 -b .6
 %patch7 -p0 -b .7
-cd ..
+popd
 
 %build
 %configure
@@ -196,6 +200,7 @@
 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}
@@ -205,8 +210,15 @@
 # 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
 
-#Remove hi-typewriter keymap till we get correct version of it
-#install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/m17n/
+
+# 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
@@ -219,12 +231,13 @@
 %files
 %defattr(-,root,root)
 %doc AUTHORS COPYING README
-%{_bindir}/*
 %dir %{_datadir}/m17n
 %dir %{_datadir}/m17n/icons
 %{_datadir}/m17n/mdb.dir
 %{_datadir}/m17n/*.tbl
 %{_datadir}/m17n/global.mim
+%dir %{_datadir}/ibus
+%dir %{_datadir}/ibus/engine
 
 
 # include translations
@@ -239,43 +252,67 @@
 
 %files devel
 %defattr(-,root,root)
+%{_bindir}/m17n-db
+%{_bindir}/m17n-gen-ibus-engine
 %{_datadir}/pkgconfig/m17n-db.pc
 
 %files common-cjk
 %defattr(-,root,root)
 %{_datadir}/m17n/cjk-*.mim
-%{_datadir}/m17n/global.mim
 
 %files chinese
 %defattr(-,root,root)
 %{_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
+* Tue Oct 21 2008 Parag Nemade <pnemade at redhat.com> -1.5.3-1.fc10
+- Update to new upstream release 1.5.3
+
+* Mon Oct 20 2008 Jens Petersen <petersen at redhat.com> - 1.5.2-4.fc10
+- add obsoletes for ibus-m17n subpackages
+- fix m17n-gen-ibus-engine to check for lang 't'
+
+* Wed Oct 15 2008 Jens Petersen <petersen at redhat.com> - 1.5.2-3.fc10
+- create .engine files for ibus-m17n with m17n-gen-ibus-engine (#466410)
+
+* Fri Aug 29 2008 Parag Nemade <pnemade at redhat.com> -1.5.2-2
+- Recreated patch si-wijesekera-keymap-rename_key-summary.patch
+
+* Thu Jul 03 2008 Parag Nemade <pnemade at redhat.com> -1.5.2-1
+- Update to new upstream release 1.5.2
+
 * Fri Apr 04 2008 Parag Nemade <pnemade at redhat.com> -1.5.1-3.fc9
 - Resolves:rh#440567
 

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

Index: si-wijesekera-keymap-rename_key-summary.patch
===================================================================
RCS file: /cvs/extras/rpms/m17n-db/F-9/si-wijesekera-keymap-rename_key-summary.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- si-wijesekera-keymap-rename_key-summary.patch	8 Jan 2007 13:04:19 -0000	1.1
+++ si-wijesekera-keymap-rename_key-summary.patch	7 Nov 2008 07:25:45 -0000	1.2
@@ -1,8 +1,8 @@
---- si-wijesekera-preedit.mim	2006-12-05 16:28:57.000000000 +0530
-+++ si-wijesekera-preedit.mim.new	2007-01-08 18:26:08.000000000 +0530
+--- si-wijesekera-preedit.mim.orig	2007-05-29 14:44:23.000000000 +0530
++++ si-wijesekera-preedit.mim	2008-08-29 09:35:17.000000000 +0530
 @@ -21,11 +21,21 @@
- ;; Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- ;; 02111-1307, USA.
+ ;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ ;; Boston, MA 02110-1301, USA.
  
 -(input-method si wijesekera-preedit)
 +(input-method si wijesekera)
@@ -23,3 +23,4 @@
  ")
  
  (title "à·ƒà·’")
+


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/m17n-db/F-9/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- sources	7 Feb 2008 06:07:11 -0000	1.67
+++ sources	7 Nov 2008 07:25:45 -0000	1.68
@@ -1 +1 @@
-1627c9d8808115567412192a595a434b  m17n-db-1.5.1.tar.gz
+0fdf4582389bb8de75de88caffdd0776  m17n-db-1.5.3.tar.gz


