rpms/m17n-lib/devel m17n-lib.spec, 1.27, 1.28 internal-flt.h, 1.1, NONE m17n-lib-nobuild-examples.patch, 1.2, NONE

[Jens Petersen]

Author: petersen

Update of /cvs/extras/rpms/m17n-lib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15730

Modified Files:
	m17n-lib.spec 
Removed Files:
	internal-flt.h m17n-lib-nobuild-examples.patch 
Log Message:
- add bcond for otf, anthy, and gui
- subpackage flt for emacs, etc
- add subpackages for anthy and ispell modules
- disable new gui subpackage (and hence ispell)




Index: m17n-lib.spec
===================================================================
RCS file: /cvs/extras/rpms/m17n-lib/devel/m17n-lib.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- m17n-lib.spec	18 Aug 2009 08:52:22 -0000	1.27
+++ m17n-lib.spec	23 Dec 2009 09:44:36 -0000	1.28
@@ -1,11 +1,13 @@
-# set to 1 to build with GUI and OpenType Font support
-%define with_gui 0
-# set to 1 to build examples (including anthy support)
-%define with_examples 0
+%bcond_without otf
+
+# note this duplicates native anthy IMEs
+%bcond_without anthy
+# use --with gui to build GUI library
+%bcond_with gui
 
 Name:    m17n-lib
 Version:  1.5.5
-Release:  1%{?dist}
+Release:  2%{?dist}
 Summary:  Multilingual text library
 
 Group:    System Environment/Libraries
@@ -13,52 +15,79 @@ 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)
-
-%if %{with_gui}
-BuildRequires:  libxml2-devel, xorg-x11-devel
-BuildRequires:  freetype-devel >= 2.0, fribidi-devel, gd-devel >= 2.0
-BuildRequires:  libotf-devel >= %{libotf_version}
-%else
-BuildRequires:  autoconf
-BuildRequires:  libtool
-BuildRequires:  pkgconfig
-%endif
-%if %{with_examples}
+BuildRequires:  m17n-db-devel = %{version}
+%if %{with anthy}
 BuildRequires:  anthy-devel
 %endif
-Requires:  m17n-db >= 1.4.0
-Patch2:    m17n-lib-nobuild-examples.patch
+%if %{with gui}
+BuildRequires:  libxml2-devel, libXft-devel, fontconfig-devel
+BuildRequires:  freetype-devel >= 2.0, fribidi-devel, gd-devel >= 2.0, libXaw-devel
+# ispell seems to depend on gui
+BuildRequires:  aspell
+%endif
+%if %{with otf}
+BuildRequires:  libotf-devel
+%endif
+Requires:  m17n-db = %{version}
 
 %description
 m17n-lib is a multilingual text library used primarily to allow
 the input of many languages with the input table maps from m17n-db.
 
+The package provides the core and input method backend libraries.
+
+%package  anthy
+Summary:  Anthy module for m17n
+Group:    System Environment/Libraries
+
+%description anthy
+Anthy module for %{name} allows ja-anthy.mim to support input conversion.
+
 
 %package  devel
 Summary:  m17n-lib development files
 Group:    Development/Libraries
 Requires:  %{name} = %{version}-%{release}
+Requires:  %{name}-flt = %{version}-%{release}
+Requires:  %{name}-anthy = %{version}-%{release}
 
 %description devel
 Development files for %{name}.
 
 
-%prep
-%setup -q
+%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_examples}
-%patch2 -p1 -b .examples
+
+%if %{with gui}
+%package  gui
+Summary:  m17n GUI Library
+Group:    System Environment/Libraries
+Requires: m17n-db-datafiles
+
+%description gui
+M17n GUI widget library.
+
+
+%package  ispell
+Summary:  Spelling module for m17n
+Group:    System Environment/Libraries
+
+%description ispell
+Ispell module for m17n input.
 %endif
-# patch2 touches Makefile.am
-autoreconf
+
+
+%prep
+%setup -q
 
 %build
-%configure --disable-static \
-%if ! %{with_gui}
-  --without-gui
-%else
-  %{nil}
-%endif
+%configure --disable-static %{!?with_gui:--without-gui}
 make
 
 
@@ -67,9 +96,12 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -c -p"
 
 # remove unneeded files
-rm $RPM_BUILD_ROOT%{_bindir}/m17n-config
 rm $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
+%if %{without anthy}
+rm $RPM_BUILD_ROOT%{_libdir}/libmimx-anthy*
+%endif
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -84,18 +116,51 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %doc AUTHORS COPYING NEWS
-%{_libdir}/lib*.so.*
+%{_bindir}/m17n-conv
+%{_libdir}/libm17n.so.*
+%{_libdir}/libm17n-core.so.*
+
+%files anthy
+%defattr(-,root,root)
+%{_libdir}/libmimx-anthy.so.*
 
 %files devel
 %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)
+%{_bindir}/m17n-date
+%{_bindir}/m17n-dump
+%{_bindir}/m17n-edit
+%{_bindir}/m17n-view
+%{_libdir}/libm17n-X.so.*
+%{_libdir}/libm17n-gd.so.*
+%{_libdir}/libm17n-gui.so.*
+
+%files ispell
+%defattr(-,root,root)
+%{_libdir}/libmimx-ispell.so.*
+%endif
+
 
 %changelog
-* Mon Aug 17 2009 Parag Nemade <pnemade at redhat.com> -1.5.5-1
+* Wed Dec 23 2009 Jens Petersen <petersen at redhat.com> - 1.5.5-2
+- add bcond for otf, anthy, and gui
+- subpackage flt for emacs, etc
+- add subpackages for anthy and ispell modules
+- disable new gui subpackage (and hence ispell)
+
+* Mon Aug 17 2009 Parag Nemade <pnemade at redhat.com> - 1.5.5-1
 - update to new upstream release 1.5.5
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.4-2


--- internal-flt.h DELETED ---


--- m17n-lib-nobuild-examples.patch DELETED ---