pool/m17n-lib
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 77976 from M17N

Browse Source 
- Update to version 1.6.2: bug fix release; see ChangeLog
- Fix compile warnings
- Split libm17n0 subpackage for shared libraries
- Add baselibs.conf

OBS-URL: https://build.opensuse.org/request/show/77976
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/m17n-lib?expand=0&rev=15
This commit is contained in:
Sascha Peilicke 2011-08-04 12:38:47 +00:00 committed by Git OBS Bridge
commit f548c0ffc1
6 changed files with 70 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
baselibs.conf Normal file
View File

@ -0,0 +1 @@
libm17n0

3
m17n-lib-1.6.0.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e785eb18fceb20b74fc61685cb41eb6e6f53051267e1e7ad65f0a796bb980aaf
size 759479

3
m17n-lib-1.6.2.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f15039a310e94d6b462c46c409a393e1b16d95f13fd0376361f07bbfc6adb5a3
size 1031508

36
m17n-lib-fix-warnings.diff Normal file
View File

@ -0,0 +1,36 @@
---
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,

8
m17n-lib.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
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
-------------------------------------------------------------------
Mon May 17 14:41:39 UTC 2010 - coolo@novell.com

34
m17n-lib.spec
View File

@ -20,24 +20,31 @@
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
Version: 1.6.2
Release: 2
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 +57,7 @@ A multilingual text processing library for the C language
%prep
%setup -q
#find . -name CVS -type d | xargs rm -rf
%patch0 -p1
%build
export SUSE_ASNEEDED=0
@ -82,21 +89,24 @@ rm -f %{buildroot}%{_libdir}/*.la
%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}/*