[m17n-lib/f15/master] Resolves: rh#680363 - Remove m17n-lib-ispell subpackage Resolves: rh#677866 - m17n*.pc reports wrong
pnemade
pnemade at fedoraproject.org
Tue Mar 22 06:55:37 UTC 2011
commit 69bc3de4ddc370def76614c4907de42ada837987
Author: Parag Nemade <pnemade at redhat.com>
Date: Tue Mar 22 12:25:23 2011 +0530
Resolves: rh#680363 - Remove m17n-lib-ispell subpackage
Resolves: rh#677866 - m17n*.pc reports wrong moduledir on x86_64 system
m17n-lib-1.6.2-fix-pkgconfig-path.patch | 45 +++++++++++++++++++++++++++++++
m17n-lib.spec | 21 +++++---------
2 files changed, 53 insertions(+), 13 deletions(-)
---
diff --git a/m17n-lib-1.6.2-fix-pkgconfig-path.patch b/m17n-lib-1.6.2-fix-pkgconfig-path.patch
new file mode 100644
index 0000000..3e88870
--- /dev/null
+++ b/m17n-lib-1.6.2-fix-pkgconfig-path.patch
@@ -0,0 +1,45 @@
+--- 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.
+
diff --git a/m17n-lib.spec b/m17n-lib.spec
index e4f2a85..8d17d30 100644
--- a/m17n-lib.spec
+++ b/m17n-lib.spec
@@ -3,7 +3,7 @@
Name: m17n-lib
Version: 1.6.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Multilingual text library
Group: System Environment/Libraries
@@ -11,6 +11,8 @@ License: LGPLv2
URL: http://www.m17n.org/m17n-lib/index.html
Source0: http://www.m17n.org/m17n-lib-download/%{name}-%{version}.tar.gz
Patch0: m17n-lib-1.6.1-multilib.patch
+Patch1: m17n-lib-1.6.2-fix-pkgconfig-path.patch
+
BuildRequires: m17n-db-devel libthai
%if %{with anthy}
BuildRequires: anthy-devel
@@ -60,17 +62,10 @@ Requires: m17n-db-extras
Tools to test M17n GUI widget library.
-%package ispell
-Summary: Spelling module for m17n
-Group: System Environment/Libraries
-
-%description ispell
-Ispell module for m17n input.
-
-
%prep
%setup -q
%patch0 -p0
+%patch1 -p0
%build
%configure --disable-rpath --disable-static
@@ -123,12 +118,12 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%{_libdir}/m17n/1.0/libm17n-gd.so
%{_libdir}/libm17n-gui.so.*
-%files ispell
-%defattr(-,root,root,-)
-%{_libdir}/m17n/1.0/libmimx-ispell.so
-
%changelog
+* Tue Mar 22 2011 Parag Nemade <pnemade AT redhat DOT com> - 1.6.2-3
+- Resolves: rh#680363 - Remove m17n-lib-ispell subpackage
+- Resolves: rh#677866 - m17n*.pc reports wrong moduledir on x86_64 system
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list