Update to 1.8.0 (#1523968)
This commit is contained in:
Parag Nemade
parent
47173457d5
commit
c35edadca6
1
.gitignore
vendored
1
.gitignore
vendored
@ -3,3 +3,4 @@ m17n-lib-1.6.1.tar.gz
|
||||
/m17n-lib-1.6.3.tar.gz
|
||||
/m17n-lib-1.6.4.tar.gz
|
||||
/m17n-lib-1.7.0.tar.gz
|
||||
/m17n-lib-1.8.0RC.tar.gz
|
||||
|
||||
@ -1,45 +0,0 @@
|
||||
--- m17n-core.pc.in 2010/04/07 08:07:26 1.2
|
||||
+++ m17n-core.pc.in 2011/02/21 11:21:59 1.3
|
||||
@@ -3,7 +3,7 @@
|
||||
libdir=@libdir@
|
||||
includedir=@includedir@
|
||||
|
||||
-moduledir=${exec_prefix}/lib/@M17N_MODULE_DIR@
|
||||
+moduledir=${libdir}/@M17N_MODULE_DIR@
|
||||
|
||||
Name: m17n-core
|
||||
Description: Core API suport of the m17n library.
|
||||
--- m17n-flt.pc.in 2010/04/07 08:07:59 1.3
|
||||
+++ m17n-flt.pc.in 2011/02/21 11:22:46 1.4
|
||||
@@ -4,7 +4,7 @@
|
||||
includedir=@includedir@
|
||||
version=@PACKAGE_VERSION@
|
||||
|
||||
-moduledir=${exec_prefix}/lib/@M17N_MODULE_DIR@
|
||||
+moduledir=${libdir}/@M17N_MODULE_DIR@
|
||||
|
||||
Name: m17n-flt
|
||||
Description: FLT API suport of the m17n library.
|
||||
--- m17n-gui.pc.in 2010/04/07 08:08:14 1.2
|
||||
+++ m17n-gui.pc.in 2011/02/21 11:23:02 1.3
|
||||
@@ -4,7 +4,7 @@
|
||||
includedir=@includedir@
|
||||
version=@PACKAGE_VERSION@
|
||||
|
||||
-moduledir=${exec_prefix}/lib/@M17N_MODULE_DIR@
|
||||
+moduledir=${libdir}/@M17N_MODULE_DIR@
|
||||
|
||||
Name: m17n-gui
|
||||
Description: GUI API suport of the m17n library.
|
||||
--- m17n-shell.pc.in 2010/04/07 08:07:44 1.3
|
||||
+++ m17n-shell.pc.in 2011/02/21 11:22:23 1.4
|
||||
@@ -4,7 +4,7 @@
|
||||
includedir=@includedir@
|
||||
version=@PACKAGE_VERSION@
|
||||
|
||||
-moduledir=${exec_prefix}/lib/@M17N_MODULE_DIR@
|
||||
+moduledir=${libdir}/@M17N_MODULE_DIR@
|
||||
|
||||
Name: m17n-shell
|
||||
Description: Shell API support of the m17n library.
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,43 +0,0 @@
|
||||
From 868093b0b0504da6693f5e868e7deb468009b5af Mon Sep 17 00:00:00 2001
|
||||
From: Mike FABIAN <mfabian@redhat.com>
|
||||
Date: Wed, 26 Aug 2015 15:42:28 +0200
|
||||
Subject: [PATCH] Bug 1256244 - Transliteration not working on Marathi language
|
||||
|
||||
---
|
||||
src/input.c | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/input.c b/src/input.c
|
||||
index 1160085..5a86b10 100644
|
||||
--- a/src/input.c
|
||||
+++ b/src/input.c
|
||||
@@ -1083,7 +1083,7 @@ load_translation (MIMMap *map, MPlist *keylist, MPlist *map_actions,
|
||||
len = MPLIST_LENGTH (elt);
|
||||
if (MFAILP (len > 0))
|
||||
return -1;
|
||||
- keyseq = (MSymbol *) alloca (sizeof (int) * len);
|
||||
+ keyseq = (MSymbol *) alloca (sizeof (MSymbol) * len);
|
||||
for (i = 0; i < len; i++, elt = MPLIST_NEXT (elt))
|
||||
{
|
||||
if (MPLIST_INTEGER_P (elt))
|
||||
@@ -4264,7 +4264,7 @@ filter (MInputContext *ic, MSymbol key, void *arg)
|
||||
if (ic_info->commit_key_head > 0)
|
||||
{
|
||||
memmove (ic_info->keys, ic_info->keys + ic_info->commit_key_head,
|
||||
- sizeof (int) * (ic_info->used - ic_info->commit_key_head));
|
||||
+ sizeof (MSymbol *) * (ic_info->used - ic_info->commit_key_head));
|
||||
ic_info->used -= ic_info->commit_key_head;
|
||||
ic_info->key_head -= ic_info->commit_key_head;
|
||||
ic_info->state_key_head -= ic_info->commit_key_head;
|
||||
@@ -4278,7 +4278,7 @@ filter (MInputContext *ic, MSymbol key, void *arg)
|
||||
if (ic_info->key_head > 0)
|
||||
{
|
||||
memmove (ic_info->keys, ic_info->keys + ic_info->key_head,
|
||||
- sizeof (int) * (ic_info->used - ic_info->key_head));
|
||||
+ sizeof (MSymbol *) * (ic_info->used - ic_info->key_head));
|
||||
ic_info->used -= ic_info->key_head;
|
||||
ic_info->key_head = ic_info->state_key_head
|
||||
= ic_info->commit_key_head = 0;
|
||||
--
|
||||
2.4.3
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
diff -up m17n-lib-1.6.4/m17n-config.in.multi m17n-lib-1.6.4/m17n-config.in
|
||||
--- m17n-lib-1.6.4/m17n-config.in.multi 2012-04-23 02:16:56.000000000 +0200
|
||||
+++ m17n-lib-1.6.4/m17n-config.in 2013-03-14 09:17:32.061122801 +0100
|
||||
diff -up m17n-lib-1.8.0RC/m17n-config.in.multi m17n-lib-1.8.0RC/m17n-config.in
|
||||
--- m17n-lib-1.8.0RC/m17n-config.in.multi 2012-04-23 02:16:56.000000000 +0200
|
||||
+++ m17n-lib-1.8.0RC/m17n-config.in 2013-03-14 09:17:32.061122801 +0100
|
||||
@@ -64,17 +64,15 @@ else
|
||||
LIBNAME="$LIBNAME$LIBSHELL$LIBFLT$LIBGUI"
|
||||
fi
|
||||
@ -2,15 +2,14 @@
|
||||
%bcond_without anthy
|
||||
|
||||
Name: m17n-lib
|
||||
Version: 1.7.0
|
||||
Release: 8%{?dist}
|
||||
Version: 1.8.0
|
||||
Release: 0.1.RC1%{?dist}
|
||||
Summary: Multilingual text library
|
||||
|
||||
License: LGPLv2+
|
||||
URL: http://www.nongnu.org/m17n/
|
||||
Source0: http://download.savannah.gnu.org/releases/m17n/%{name}-%{version}.tar.gz
|
||||
Patch0: %{name}-1.6.1-multilib.patch
|
||||
Patch1: %{name}-1.7.0-fix-crash-in-marathi-transliteration.patch
|
||||
Source0: http://download.savannah.gnu.org/releases/m17n/%{name}-%{version}RC.tar.gz
|
||||
Patch0: %{name}-1.8.0RC-multilib.patch
|
||||
|
||||
BuildRequires: m17n-db-devel libthai-devel
|
||||
BuildRequires: libxml2-devel libXft-devel
|
||||
@ -42,7 +41,6 @@ Anthy module for %{name} allows ja-anthy.mim to support input conversion.
|
||||
|
||||
%package devel
|
||||
Summary: Development files for %{name}
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
Requires: %{name}-tools = %{version}-%{release}
|
||||
|
||||
%description devel
|
||||
@ -50,7 +48,7 @@ Development files for %{name}.
|
||||
|
||||
|
||||
%package tools
|
||||
Summary: m17n GUI Library tools
|
||||
Summary: The m17n GUI Library tools
|
||||
Requires: m17n-db-extras
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
|
||||
@ -59,12 +57,10 @@ Tools to test M17n GUI widget library.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%autosetup -n %{name}-%{version}RC
|
||||
|
||||
%build
|
||||
autoreconf -ivf
|
||||
#autoreconf -ivf
|
||||
%configure --disable-rpath --disable-static
|
||||
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
|
||||
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
|
||||
@ -73,11 +69,12 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
|
||||
make
|
||||
|
||||
%install
|
||||
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
|
||||
# fix bug rh#680363
|
||||
rm $RPM_BUILD_ROOT%{_libdir}/m17n/1.0/libmimx-ispell.so
|
||||
make install DESTDIR=%{buildroot} INSTALL="install -p"
|
||||
|
||||
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
|
||||
# fix bug rh#680363
|
||||
rm %{buildroot}%{_libdir}/m17n/1.0/libmimx-ispell.so
|
||||
|
||||
find %{buildroot} -name '*.la' -exec rm -f {} ';'
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
%postun -p /sbin/ldconfig
|
||||
@ -86,7 +83,8 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
|
||||
%postun tools -p /sbin/ldconfig
|
||||
|
||||
%files
|
||||
%doc AUTHORS COPYING NEWS ChangeLog README
|
||||
%doc AUTHORS NEWS ChangeLog README
|
||||
%license COPYING
|
||||
#Own module directory path
|
||||
%dir %{_libdir}/m17n
|
||||
%dir %{_libdir}/m17n/1.0
|
||||
@ -100,7 +98,6 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
|
||||
%{_libdir}/m17n/1.0/libmimx-anthy.so
|
||||
|
||||
%files devel
|
||||
%{_bindir}/m17n-config
|
||||
%{_includedir}/*
|
||||
%{_libdir}/lib*.so
|
||||
%{_libdir}/pkgconfig/*
|
||||
@ -115,6 +112,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
|
||||
%{_libdir}/libm17n-gui.so.*
|
||||
|
||||
%changelog
|
||||
* Wed Jan 03 2018 Parag Nemade <pnemade AT redhat DOT com> - 1.8.0-0.1.RC1
|
||||
- Update to 1.8.0 (#1523968)
|
||||
|
||||
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user