rpms/m17n-lib
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Resolves: rh#680363 - Remove m17n-lib-ispell subpackage

Browse Source 
Resolves: rh#677866 - m17n*.pc reports wrong moduledir on x86_64 system
This commit is contained in:
Parag Nemade 2011-03-22 14:42:56 +05:30
parent 5adc9471f0
commit b768eafb9e
2 changed files with 55 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
m17n-lib-1.6.2-fix-pkgconfig-path.patch Normal file
View File

@ -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.

27
m17n-lib.spec
View File

@ -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,14 +11,14 @@ 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
%endif
BuildRequires: libxml2-devel, libXft-devel, fontconfig-devel
BuildRequires: freetype-devel , fribidi-devel, gd-devel, libXaw-devel
# ispell seems to depend on tools
BuildRequires: aspell
BuildRequires: libotf-devel
Requires: m17n-db
Obsoletes: m17n-lib-flt < 1.6.0-1.fc14
@ -60,17 +60,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
@ -81,16 +74,16 @@ 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
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%post tools -p /sbin/ldconfig
%postun tools -p /sbin/ldconfig
%files
@ -123,12 +116,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@lists.fedoraproject.org> - 1.6.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild