commit m17n-lib for openSUSE:Factory
Hello community, here is the log from the commit of package m17n-lib for openSUSE:Factory checked in at Thu Aug 4 14:38:58 CEST 2011. -------- --- m17n-lib/m17n-lib.changes 2010-05-17 16:41:59.000000000 +0200 +++ /mounts/work_src_done/STABLE/m17n-lib/m17n-lib.changes 2011-08-02 17:12:23.000000000 +0200 @@ -1,0 +2,8 @@ +Tue Aug 2 16:59:23 CEST 2011 - tiwai@suse.de + +- Update to version 1.6.2: bug fix release; see ChangeLog +- Fix compile warnings +- Split libm17n0 subpackage for shared libraries +- Add baselibs.conf + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- m17n-lib-1.6.0.tar.bz2 New: ---- baselibs.conf m17n-lib-1.6.2.tar.gz m17n-lib-fix-warnings.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ m17n-lib.spec ++++++ --- /var/tmp/diff_new_pack.X8EtKQ/_old 2011-08-04 14:34:39.000000000 +0200 +++ /var/tmp/diff_new_pack.X8EtKQ/_new 2011-08-04 14:34:39.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package m17n-lib (Version 1.6.0) +# spec file for package m17n-lib # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,24 +20,32 @@ Name: m17n-lib BuildRequires: freetype2-devel fribidi-devel gd-devel ispell ispell-british libotf-devel libxml2 m17n-db pkgconfig wordcut-devel xorg-x11-devel %define appdefdir /usr/share/X11 -Version: 1.6.0 -Release: 2 +Version: 1.6.2 +Release: 1 License: GPLv2+ ; LGPLv2.1+ ; MIT Group: System/I18n/Japanese AutoReqProv: on -Requires: m17n-db Url: http://www.m17n.org/m17n-lib/ -# CVS: -# cvs -d :pserver:anonymous@cvs.m17n.org:/cvs/m17n login -# cvs -d :pserver:anonymous@cvs.m17n.org:/cvs/m17n co m17n-lib -# cvs -d :pserver:anonymous@cvs.m17n.org:/cvs/m17n co m17n-db -Source0: http://www.m17n.org/m17n-lib/download/m17n-lib-%{version}.tar.bz2 +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 %description A multilingual text processing library for the C language. +This package contains m17n-* programs. + +%package -n libm17n0 + +Summary: Multilingual text processing library for the C language +Group: System/I18n/Japanese +Requires: m17n-db + +%description -n libm17n0 +A multilingual text processing library for the C language. +This package contains shared libraries. %package devel License: GPLv2+ ; LGPLv2.1+ ; MIT @@ -50,7 +58,7 @@ %prep %setup -q -#find . -name CVS -type d | xargs rm -rf +%patch0 -p1 %build export SUSE_ASNEEDED=0 @@ -82,21 +90,24 @@ %clean rm -rf $RPM_BUILD_ROOT -%post -p /sbin/ldconfig +%post -n libm17n0 -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%postun -n libm17n0 -p /sbin/ldconfig %files %defattr(-, root, root) %doc AUTHORS COPYING NEWS README ChangeLog -%{_libdir}/lib*.so.* -%{_libdir}/m17n %{_bindir}/* %dir %{appdefdir}/?? %dir %{appdefdir}/??_* %dir %{appdefdir}/*/app-defaults %config %{appdefdir}/*/app-defaults/M17NEdit +%files -n libm17n0 +%defattr(-, root, root) +%{_libdir}/lib*.so.* +%{_libdir}/m17n + %files devel %defattr(-, root, root) %{_includedir}/* ++++++ baselibs.conf ++++++ libm17n0 ++++++ m17n-lib-fix-warnings.diff ++++++ --- src/font.c | 5 +++-- src/fontset.c | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) --- a/src/font.c +++ b/src/font.c @@ -1354,7 +1354,7 @@ { int i; MSymbol spec_list[MFONT_REGISTRY + 1]; - MSymbol registry; + MSymbol registry = Mnil; char *reg; MFONT_INIT (spec); @@ -1365,7 +1365,8 @@ MERROR (MERROR_FONT, Mnil); spec_list[i] = MPLIST_SYMBOL (plist); } - registry = spec_list[i - 1]; + if (i > 0) + registry = spec_list[i - 1]; if (i > 1 && registry != Mnil) { reg = MSYMBOL_NAME (registry); --- a/src/fontset.c +++ b/src/fontset.c @@ -846,7 +846,6 @@ if (MPLIST_KEY (plist) != Mlatin) request.property[MFONT_FOUNDRY] - = request.property[MFONT_FAMILY] = request.property[MFONT_FAMILY] = 0; if ((per_lang = mplist_get (MPLIST_PLIST (plist), language)) && (rfont = try_font_group (realized, &request, per_lang, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de