- update to new upstream release 1.6.2
This commit is contained in:
Parag Nemade
parent
66d1541ab0
commit
9b42fecea1
1
.gitignore
vendored
1
.gitignore
vendored
@ -1 +1,2 @@
|
|||||||
m17n-lib-1.6.1.tar.gz
|
m17n-lib-1.6.1.tar.gz
|
||||||
|
/m17n-lib-1.6.2.tar.gz
|
||||||
|
|||||||
@ -1,13 +1,9 @@
|
|||||||
%bcond_without otf
|
|
||||||
|
|
||||||
# note this duplicates native anthy IMEs
|
# note this duplicates native anthy IMEs
|
||||||
%bcond_without anthy
|
%bcond_without anthy
|
||||||
# use --with gui to build GUI library
|
|
||||||
%bcond_with gui
|
|
||||||
|
|
||||||
Name: m17n-lib
|
Name: m17n-lib
|
||||||
Version: 1.6.1
|
Version: 1.6.2
|
||||||
Release: 3%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Multilingual text library
|
Summary: Multilingual text library
|
||||||
|
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
@ -15,22 +11,17 @@ License: LGPLv2
|
|||||||
URL: http://www.m17n.org/m17n-lib/index.html
|
URL: http://www.m17n.org/m17n-lib/index.html
|
||||||
Source0: http://www.m17n.org/m17n-lib-download/%{name}-%{version}.tar.gz
|
Source0: http://www.m17n.org/m17n-lib-download/%{name}-%{version}.tar.gz
|
||||||
Patch0: m17n-lib-1.6.1-multilib.patch
|
Patch0: m17n-lib-1.6.1-multilib.patch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRequires: m17n-db-devel libthai
|
||||||
BuildRequires: m17n-db-devel >= 1.6.0
|
|
||||||
%if %{with anthy}
|
%if %{with anthy}
|
||||||
BuildRequires: anthy-devel
|
BuildRequires: anthy-devel
|
||||||
%endif
|
%endif
|
||||||
%if %{with gui}
|
|
||||||
BuildRequires: libxml2-devel, libXft-devel, fontconfig-devel
|
BuildRequires: libxml2-devel, libXft-devel, fontconfig-devel
|
||||||
BuildRequires: freetype-devel >= 2.0, fribidi-devel, gd-devel >= 2.0, libXaw-devel
|
BuildRequires: freetype-devel , fribidi-devel, gd-devel, libXaw-devel
|
||||||
# ispell seems to depend on gui
|
# ispell seems to depend on tools
|
||||||
BuildRequires: aspell
|
BuildRequires: aspell
|
||||||
%endif
|
|
||||||
%if %{with otf}
|
|
||||||
BuildRequires: libotf-devel
|
BuildRequires: libotf-devel
|
||||||
%endif
|
Requires: m17n-db
|
||||||
Requires: m17n-db = %{version}
|
Obsoletes: m17n-lib-flt < 1.6.0-1.fc14
|
||||||
Obsoletes: m17n-lib-flt < 1.6.0-1.fc13
|
|
||||||
Provides: m17n-lib-flt = %{version}-%{release}
|
Provides: m17n-lib-flt = %{version}-%{release}
|
||||||
|
|
||||||
|
|
||||||
@ -54,19 +45,19 @@ Group: Development/Libraries
|
|||||||
Requires: %{name} = %{version}-%{release}
|
Requires: %{name} = %{version}-%{release}
|
||||||
Requires: %{name}-flt = %{version}-%{release}
|
Requires: %{name}-flt = %{version}-%{release}
|
||||||
Requires: %{name}-anthy = %{version}-%{release}
|
Requires: %{name}-anthy = %{version}-%{release}
|
||||||
|
Requires: %{name}-tools = %{version}-%{release}
|
||||||
|
|
||||||
%description devel
|
%description devel
|
||||||
Development files for %{name}.
|
Development files for %{name}.
|
||||||
|
|
||||||
|
|
||||||
%if %{with gui}
|
%package tools
|
||||||
%package gui
|
Summary: m17n GUI Library tools
|
||||||
Summary: m17n GUI Library
|
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
Requires: m17n-db-datafiles
|
Requires: m17n-db-extras
|
||||||
|
|
||||||
%description gui
|
%description tools
|
||||||
M17n GUI widget library.
|
Tools to test M17n GUI widget library.
|
||||||
|
|
||||||
|
|
||||||
%package ispell
|
%package ispell
|
||||||
@ -75,7 +66,6 @@ Group: System Environment/Libraries
|
|||||||
|
|
||||||
%description ispell
|
%description ispell
|
||||||
Ispell module for m17n input.
|
Ispell module for m17n input.
|
||||||
%endif
|
|
||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
@ -83,33 +73,26 @@ Ispell module for m17n input.
|
|||||||
%patch0 -p0
|
%patch0 -p0
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure --disable-rpath --disable-static %{!?with_gui:--without-gui}
|
%configure --disable-rpath --disable-static
|
||||||
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
|
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
|
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
|
||||||
make
|
make
|
||||||
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
rm -rf $RPM_BUILD_ROOT
|
|
||||||
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
|
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
|
||||||
|
|
||||||
# remove unneeded files
|
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
|
||||||
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}/m17n/1.0/libmimx-anthy*
|
|
||||||
%endif
|
|
||||||
|
|
||||||
|
|
||||||
%clean
|
|
||||||
rm -rf $RPM_BUILD_ROOT
|
|
||||||
|
|
||||||
|
|
||||||
%post -p /sbin/ldconfig
|
%post -p /sbin/ldconfig
|
||||||
|
|
||||||
%postun -p /sbin/ldconfig
|
%postun -p /sbin/ldconfig
|
||||||
|
|
||||||
|
|
||||||
|
%post tools -p /sbin/ldconfig
|
||||||
|
|
||||||
|
%postun tools -p /sbin/ldconfig
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%doc AUTHORS COPYING NEWS
|
%doc AUTHORS COPYING NEWS
|
||||||
@ -130,24 +113,35 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_libdir}/lib*.so
|
%{_libdir}/lib*.so
|
||||||
%{_libdir}/pkgconfig/*
|
%{_libdir}/pkgconfig/*
|
||||||
|
|
||||||
%if %{with gui}
|
%files tools
|
||||||
%files gui
|
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%{_bindir}/m17n-date
|
%{_bindir}/m17n-date
|
||||||
%{_bindir}/m17n-dump
|
%{_bindir}/m17n-dump
|
||||||
%{_bindir}/m17n-edit
|
%{_bindir}/m17n-edit
|
||||||
%{_bindir}/m17n-view
|
%{_bindir}/m17n-view
|
||||||
%{_libdir}/libm17n-X.so.*
|
%{_libdir}/m17n/1.0/libm17n-X.so
|
||||||
%{_libdir}/libm17n-gd.so.*
|
%{_libdir}/m17n/1.0/libm17n-gd.so
|
||||||
%{_libdir}/libm17n-gui.so.*
|
%{_libdir}/libm17n-gui.so.*
|
||||||
|
|
||||||
%files ispell
|
%files ispell
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%{_libdir}/libmimx-ispell.so.*
|
%{_libdir}/m17n/1.0/libmimx-ispell.so
|
||||||
%endif
|
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Oct 06 2010 Parag Nemade <pnemade AT redhat.com> - 1.6.2-1
|
||||||
|
- update to new upstream release 1.6.2
|
||||||
|
|
||||||
|
* Mon Sep 13 2010 Parag Nemade <pnemade AT redhat.com> - 1.6.1-5
|
||||||
|
- Fix some packaging issue
|
||||||
|
- Change Requires: m17n-db-datafiles to m17n-db-extras
|
||||||
|
|
||||||
|
* Fri Sep 10 2010 Daiki Ueno <dueno@redhat.com> - 1.6.1-4
|
||||||
|
- supply libotf cflags/libs manually, since the current libotf package
|
||||||
|
does not ship with "libotf-config" and m17n-lib cannot detect those
|
||||||
|
values
|
||||||
|
- fix paths for modules used by GUI support
|
||||||
|
|
||||||
* Wed Aug 11 2010 Adam Jackson <ajax@redhat.com> 1.6.1-3
|
* Wed Aug 11 2010 Adam Jackson <ajax@redhat.com> 1.6.1-3
|
||||||
- Fix Obsoletes: so upgrades actually work (1.5.5-3 < 1.5.5-3.fc13)
|
- Fix Obsoletes: so upgrades actually work (1.5.5-3 < 1.5.5-3.fc13)
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user