- update to new upstream release 1.6.0

.cvsignore

@@ -1 +1 @@
-m17n-lib-1.5.5.tar.gz
+m17n-lib-1.6.0.tar.gz

m17n-lib.spec

@@ -6,8 +6,8 @@
 %bcond_with gui
 
 Name:    m17n-lib
-Version:  1.5.5
-Release:  2%{?dist}
+Version:  1.6.0
+Release:  1%{?dist}
 Summary:  Multilingual text library
 
 Group:    System Environment/Libraries
@@ -15,7 +15,7 @@ License:  LGPLv2
 URL:    http://www.m17n.org/m17n-lib/index.html
 Source0:  http://www.m17n.org/m17n-lib-download/%{name}-%{version}.tar.gz
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  m17n-db-devel = %{version}
+BuildRequires:  m17n-db-devel >= 1.6.0
 %if %{with anthy}
 BuildRequires:  anthy-devel
 %endif
@@ -29,6 +29,9 @@ BuildRequires:  aspell
 BuildRequires:  libotf-devel
 %endif
 Requires:  m17n-db = %{version}
+Obsoletes: m17n-lib-flt < 1.5.5-3
+Provides: m17n-lib-flt = %{version}-%{release}
+
 
 %description
 m17n-lib is a multilingual text library used primarily to allow
@@ -45,7 +48,7 @@ Anthy module for %{name} allows ja-anthy.mim to support input conversion.
 
 
 %package  devel
-Summary:  m17n-lib development files
+Summary:  Development files for %{name}
 Group:    Development/Libraries
 Requires:  %{name} = %{version}-%{release}
 Requires:  %{name}-flt = %{version}-%{release}
@@ -55,15 +58,6 @@ Requires:  %{name}-anthy = %{version}-%{release}
 Development files for %{name}.
 
 
-%package  flt
-Summary:  m17n Font Layout Library
-Group:    System Environment/Libraries
-Requires: m17n-db-flt
-
-%description flt
-Font layout library for complex text rendering.
-
-
 %if %{with gui}
 %package  gui
 Summary:  m17n GUI Library
@@ -84,22 +78,22 @@ Ispell module for m17n input.
 
 
 %prep
-%setup -q
+%setup -q 
 
 %build
-%configure --disable-static %{!?with_gui:--without-gui}
+%configure --disable-rpath --disable-static %{!?with_gui:--without-gui}
 make
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -c -p"
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
 # remove unneeded files
 rm $RPM_BUILD_ROOT%{_libdir}/lib*.la
-
+rm $RPM_BUILD_ROOT%{_libdir}/m17n/1.0/libmimx-anthy.la
 %if %{without anthy}
-rm $RPM_BUILD_ROOT%{_libdir}/libmimx-anthy*
+rm $RPM_BUILD_ROOT%{_libdir}/m17n/1.0/libmimx-anthy*
 %endif
 
 
@@ -109,36 +103,32 @@ rm -rf $RPM_BUILD_ROOT
 
 %post -p /sbin/ldconfig
 
-
 %postun -p /sbin/ldconfig
 
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS
 %{_bindir}/m17n-conv
 %{_libdir}/libm17n.so.*
 %{_libdir}/libm17n-core.so.*
+%{_libdir}/libm17n-flt.so.*
 
 %files anthy
-%defattr(-,root,root)
-%{_libdir}/libmimx-anthy.so.*
+%defattr(-,root,root,-)
+%{_libdir}/m17n/1.0/libmimx-anthy.so
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc ChangeLog README
 %{_bindir}/m17n-config
 %{_includedir}/*
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*
 
-%files flt
-%defattr(-,root,root)
-%{_libdir}/libm17n-flt.so.*
-
 %if %{with gui}
 %files gui
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_bindir}/m17n-date
 %{_bindir}/m17n-dump
 %{_bindir}/m17n-edit
@@ -148,12 +138,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libm17n-gui.so.*
 
 %files ispell
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_libdir}/libmimx-ispell.so.*
 %endif
 
 
 %changelog
+* Wed Apr 07 2010 Parag Nemade <pnemade AT redhat.com> - 1.6.0-1
+- update to new upstream release 1.6.0
+
 * Wed Dec 23 2009 Jens Petersen <petersen@redhat.com> - 1.5.5-2
 - add bcond for otf, anthy, and gui
 - subpackage flt for emacs, etc

sources

@@ -1 +1 @@
-924875cfc30ac6620744b67385ecc144  m17n-lib-1.5.5.tar.gz
+d6138f9283cedfc2880e6b8849abb336  m17n-lib-1.6.0.tar.gz