diff --git a/m17n-lib-1.6.3.tar.gz b/m17n-lib-1.6.3.tar.gz deleted file mode 100644 index 6db4b29..0000000 --- a/m17n-lib-1.6.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ff5ebe09572a5e6d4a376783a78d4355f0b17a71fbaf8b01978230be7eef735e -size 1033048 diff --git a/m17n-lib-1.6.4.tar.gz b/m17n-lib-1.6.4.tar.gz new file mode 100644 index 0000000..43ef900 --- /dev/null +++ b/m17n-lib-1.6.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0370fda16bce321acad96b623dbbead0d797d86f5d5fa43d0cde8ff3b01555a4 +size 1034422 diff --git a/m17n-lib.changes b/m17n-lib.changes index e5f8c75..c1c09eb 100644 --- a/m17n-lib.changes +++ b/m17n-lib.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jul 1 09:38:07 UTC 2013 - i@marguerite.su + +- update version 1.6.4 + * no change, just update version number + ------------------------------------------------------------------- Mon Mar 18 09:21:48 UTC 2013 - cfarrell@suse.com diff --git a/m17n-lib.spec b/m17n-lib.spec index 387977a..499c8fa 100644 --- a/m17n-lib.spec +++ b/m17n-lib.spec @@ -17,6 +17,18 @@ Name: m17n-lib +%define appdefdir /usr/share/X11 +Version: 1.6.4 +Release: 0 +Summary: Multilingual Text Processing Library for the C Language +License: LGPL-2.1+ and GPL-2.0+ +Group: System/I18n/Japanese +Url: http://www.m17n.org/m17n-lib/ +Source0: http://download.savannah.gnu.org/releases/m17n/%{name}-%{version}.tar.gz +Source1: m17n-lib-rpmlintrc +Source2: baselibs.conf +Patch0: m17n-lib-fix-warnings.diff +BuildRequires: fdupes BuildRequires: freetype2-devel BuildRequires: fribidi-devel BuildRequires: gd-devel @@ -28,18 +40,7 @@ BuildRequires: m17n-db BuildRequires: pkgconfig BuildRequires: wordcut-devel BuildRequires: xorg-x11-devel -%define appdefdir /usr/share/X11 -Version: 1.6.3 -Release: 0 -Url: http://www.m17n.org/m17n-lib/ -Source0: http://www.m17n.org/m17n-lib-download/m17n-lib-%{version}.tar.gz -Source1: m17n-lib-rpmlintrc -Source2: baselibs.conf -Patch0: m17n-lib-fix-warnings.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -Summary: Multilingual Text Processing Library for the C Language -License: LGPL-2.1+ and GPL-2.0+ -Group: System/I18n/Japanese %description A multilingual text processing library for the C language. @@ -72,32 +73,31 @@ A multilingual text processing library for the C language %build export SUSE_ASNEEDED=0 %configure --disable-static --with-pic -%{__make} +make %check export MALLOC_CHECK_=2 -%{__make} check +make check unset MALLOC_CHECK_ %install -make DESTDIR=${RPM_BUILD_ROOT} install +%makeinstall # Japanese app-defaults: -mkdir -p $RPM_BUILD_ROOT%{appdefdir}/{ja,ja_JP,ja_JP.eucJP,ja_JP.SJIS,ja_JP.UTF-8}/app-defaults +mkdir -p %{buildroot}%{appdefdir}/{ja,ja_JP,ja_JP.eucJP,ja_JP.SJIS,ja_JP.UTF-8}/app-defaults iconv -f EUC-JP -t EUC-JP < example/M17NEdit.ja \ - > $RPM_BUILD_ROOT%{appdefdir}/ja/app-defaults/M17NEdit + > %{buildroot}%{appdefdir}/ja/app-defaults/M17NEdit iconv -f EUC-JP -t EUC-JP < example/M17NEdit.ja \ - > $RPM_BUILD_ROOT%{appdefdir}/ja_JP/app-defaults/M17NEdit + > %{buildroot}%{appdefdir}/ja_JP/app-defaults/M17NEdit iconv -f EUC-JP -t EUC-JP < example/M17NEdit.ja \ - > $RPM_BUILD_ROOT%{appdefdir}/ja_JP.eucJP/app-defaults/M17NEdit + > %{buildroot}%{appdefdir}/ja_JP.eucJP/app-defaults/M17NEdit iconv -f EUC-JP -t SJIS < example/M17NEdit.ja \ - > $RPM_BUILD_ROOT%{appdefdir}/ja_JP.SJIS/app-defaults/M17NEdit + > %{buildroot}%{appdefdir}/ja_JP.SJIS/app-defaults/M17NEdit iconv -f EUC-JP -t UTF-8 < example/M17NEdit.ja \ - > $RPM_BUILD_ROOT%{appdefdir}/ja_JP.UTF-8/app-defaults/M17NEdit + > %{buildroot}%{appdefdir}/ja_JP.UTF-8/app-defaults/M17NEdit rm -f %{buildroot}%{_libdir}/m17n/*/*.la rm -f %{buildroot}%{_libdir}/*.la -%clean -rm -rf $RPM_BUILD_ROOT +%fdupes %{buildroot} %post -n libm17n0 -p /sbin/ldconfig @@ -110,7 +110,7 @@ rm -rf $RPM_BUILD_ROOT %dir %{appdefdir}/?? %dir %{appdefdir}/??_* %dir %{appdefdir}/*/app-defaults -%config %{appdefdir}/*/app-defaults/M17NEdit +%{appdefdir}/*/app-defaults/M17NEdit %files -n libm17n0 %defattr(-, root, root)