- add common-cjk option to mk_pkg for zh and ko

- use mk_pkg for zh, el, ka, ug dropping old obsoletes
- bring back ja-anthy and en-ispell
- cleanup trailing whitespace
This commit is contained in:
Jens Petersen 2009-12-18 04:17:45 +00:00
parent 46d8dd025c
commit 36041be150

View File

@ -1,7 +1,7 @@
Name: m17n-db
Summary: Multilingualization datafiles for m17n-lib
Version: 1.5.5
Release: 1%{?dist}
Release: 2%{?dist}
Group: System Environment/Libraries
License: LGPLv2+
URL: http://www.m17n.org/m17n-lib/index.html
@ -25,7 +25,7 @@ for many languages.
%package datafiles
Summary: Multilingualization datafiles for m17n-lib
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description datafiles
m17n-db datafiles not needed for using the input maps.
@ -44,67 +44,28 @@ m17n-db development files
%package common-cjk
Summary: Common m17n-db files for CJK input
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description common-cjk
m17n-db common files for Chinese, Japanese and Korean input maps.
%package chinese
Summary: Chinese m17n-db input maps
Group: System Environment/Libraries
Requires: %{name}-common-cjk
Obsoletes: %{name}-bopomofo < 1.3.3-13.fc6
Obsoletes: ibus-m17n-chinese < 0.1.1.20081013-3
%description chinese
m17n-db Chinese input map.
%package generic
Summary: Generic m17n-db input maps
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description generic
This package contains generic m17n-db input maps.
%package greek
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.
%package gregorian
Summary: Gregorian m17n-db input maps
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
Obsoletes: m17n-db-georgian <= 1.4.0
Obsoletes: ibus-m17n-gregorian < 0.1.1.20081013-3
%description gregorian
m17n-db Gregorian input table.
%package uyghur
Summary: Uyghur m17n-db input maps
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
Obsoletes: m17n-db-Uyghur <= 1.4.0
Obsoletes: ibus-m17n-uyghur < 0.1.1.20081013-3
%description uyghur
m17n-db uyghur input table.
# 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\
@ -117,8 +78,9 @@ This package contains m17n-db input maps for %(echo %1 | sed -e "s/\\(.*\\)/\\u\
%{_datadir}/m17n/icons/%2-*.png\
%else\
%{nil}\
%endif\
%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/")\
@ -137,7 +99,7 @@ This package contains m17n-db input maps for %(echo %1 | sed -e "s/\\(.*\\)/\\u\
%{_datadir}/m17n/icons/%2-*.png\
%else\
%{nil}\
%endif\
%endif
%mk_pkg amharic am 1
%mk_pkg arabic ar 1
@ -145,19 +107,24 @@ This package contains m17n-db input maps for %(echo %1 | sed -e "s/\\(.*\\)/\\u\
%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
%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
@ -175,11 +142,12 @@ This package contains m17n-db input maps for %(echo %1 | sed -e "s/\\(.*\\)/\\u\
%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
@ -198,9 +166,6 @@ make
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# 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}
# don't ship unijoy map for now
rm $RPM_BUILD_ROOT%{_datadir}/m17n/{bn-unijoy.mim,icons/bn-unijoy.png}
@ -244,36 +209,22 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root)
%{_datadir}/m17n/cjk-*.mim
%files chinese
%defattr(-,root,root)
%{_datadir}/m17n/zh-*.mim
%{_datadir}/m17n/icons/zh-*.png
%{_datadir}/m17n/icons/bopo-*.png
%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
%files greek
%defattr(-,root,root)
%{_datadir}/m17n/el-*.mim
%{_datadir}/m17n/grc-*.mim
%{_datadir}/m17n/icons/el-*.png
%files gregorian
%defattr(-,root,root)
%{_datadir}/m17n/ka*.mim
%{_datadir}/m17n/icons/ka*.png
%files uyghur
%defattr(-,root,root)
%dir %{_datadir}/m17n
%{_datadir}/m17n/ug-*.mim
%changelog
* Fri Dec 18 2009 Jens Petersen <petersen@redhat.com> - 1.5.5-2
- add common-cjk option to mk_pkg for zh and ko
- use mk_pkg for zh, el, ka, ug
- bring back ja-anthy and en-ispell
- cleanup trailing whitespace
* Wed Jul 29 2009 Parag Nemade <pnemade@redhat.com> -1.5.5-1
- update to new upstream release 1.5.5
@ -326,12 +277,12 @@ rm -rf $RPM_BUILD_ROOT
- Added Obsoletes to m17n-db-uyghur
- Added Provides to m17n-db-gregorian, m17n-db-gregorian, m17n-db-chinese
* Mon Aug 13 2007 Parag Nemade <pnemade@redhat.com>
* Mon Aug 13 2007 Parag Nemade <pnemade@redhat.com>
- update License tag
* 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
- 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
@ -437,7 +388,7 @@ rm -rf $RPM_BUILD_ROOT
- Added 09CE mapped to z in as-inscript (213372)
* Mon Nov 1 2006 Mayank Jain <majain@redhat.com>
- Imported m17n-db-indic-0.4.29.tar.gz from RHEL-5 package, changes happened from .28 version are
- Imported m17n-db-indic-0.4.29.tar.gz from RHEL-5 package, changes happened from .28 version are
- Added few more key combinations for ta-typewriter keymap - bug 209088
- Added ZWJ for hi-inscript and hi-phonetic keymaps - bug 211576
- Corrected kn-kgp and kn-inscript keymaps for keymapping of X - bug 209963