[m17n-lib] Resolves:rh#877925 - drop m17n-lib-flt provides
pnemade
pnemade at fedoraproject.org
Wed Nov 21 09:26:08 UTC 2012
commit 640fdd0524bd786135c865cbc1e226b555f911ed
Author: Parag Nemade <pnemade at redhat.com>
Date: Wed Nov 21 14:57:42 2012 +0530
Resolves:rh#877925 - drop m17n-lib-flt provides
m17n-lib.spec | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
---
diff --git a/m17n-lib.spec b/m17n-lib.spec
index d6fa822..9611606 100644
--- a/m17n-lib.spec
+++ b/m17n-lib.spec
@@ -3,14 +3,14 @@
Name: m17n-lib
Version: 1.6.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Multilingual text library
Group: System Environment/Libraries
-License: LGPLv2
+License: LGPLv2+
URL: http://www.nongnu.org/m17n/
Source0: http://download.savannah.gnu.org/releases/m17n/%{name}-%{version}.tar.gz
-Patch0: m17n-lib-1.6.1-multilib.patch
+Patch0: %{name}-1.6.1-multilib.patch
BuildRequires: m17n-db-devel libthai
%if %{with anthy}
@@ -20,8 +20,6 @@ BuildRequires: libxml2-devel, libXft-devel, fontconfig-devel
BuildRequires: freetype-devel , fribidi-devel, gd-devel, libXaw-devel
BuildRequires: libotf-devel
Requires: m17n-db
-Obsoletes: m17n-lib-flt < 1.6.0-1.fc14
-Provides: m17n-lib-flt = %{version}-%{release}
%description
@@ -33,6 +31,7 @@ The package provides the core and input method backend libraries.
%package anthy
Summary: Anthy module for m17n
Group: System Environment/Libraries
+Requires: %{name}%{?_isa} = %{version}-%{release}
%description anthy
Anthy module for %{name} allows ja-anthy.mim to support input conversion.
@@ -41,10 +40,8 @@ Anthy module for %{name} allows ja-anthy.mim to support input conversion.
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: %{name}-flt = %{version}-%{release}
-Requires: %{name}-anthy = %{version}-%{release}
-Requires: %{name}-tools = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: %{name}-tools = %{version}-%{release}
%description devel
Development files for %{name}.
@@ -54,6 +51,7 @@ Development files for %{name}.
Summary: m17n GUI Library tools
Group: System Environment/Libraries
Requires: m17n-db-extras
+Requires: %{name}%{?_isa} = %{version}-%{release}
%description tools
Tools to test M17n GUI widget library.
@@ -67,7 +65,7 @@ Tools to test M17n GUI widget library.
%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
-make
+make %{_smp_mflags}
%install
@@ -80,22 +78,23 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
-
+#This is needed for libm17n-gui.so.*
%post tools -p /sbin/ldconfig
%postun tools -p /sbin/ldconfig
%files
-%doc AUTHORS COPYING NEWS
+%doc AUTHORS COPYING NEWS ChangeLog README
+%{_libdir}/m17n
%{_bindir}/m17n-conv
%{_libdir}/libm17n.so.*
%{_libdir}/libm17n-core.so.*
%{_libdir}/libm17n-flt.so.*
+#Anthy module
%files anthy
%{_libdir}/m17n/1.0/libmimx-anthy.so
%files devel
-%doc ChangeLog README
%{_bindir}/m17n-config
%{_includedir}/*
%{_libdir}/lib*.so
@@ -111,6 +110,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%{_libdir}/libm17n-gui.so.*
%changelog
+* Tue Nov 20 2012 Parag Nemade <pnemade AT redhat DOT com> - 1.6.4-2
+- Resolves:rh#877925 - drop m17n-lib-flt provides
+
* Tue Sep 18 2012 Parag Nemade <pnemade AT redhat DOT com> - 1.6.4-1
- update to 1.6.4
More information about the scm-commits
mailing list