Accepting request 515432 from home:scarabeus_iv:branches:M17N

- Drop ispell dependency wrt fate#323578 rh dropped the same subpkg
  in 2011
- Cleanup the dependencies to not pull in full x11 suite and depend
  only on the required libs
- Build with --as-needed
- Format with spec-cleaner

OBS-URL: https://build.opensuse.org/request/show/515432
OBS-URL: https://build.opensuse.org/package/show/M17N/m17n-lib?expand=0&rev=22
This commit is contained in:
Marguerite Su 2017-08-09 12:24:26 +00:00 committed by Git OBS Bridge
parent a4fca570c6
commit 0887012df0
2 changed files with 33 additions and 27 deletions

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Wed Aug 9 11:26:06 UTC 2017 - tchvatal@suse.com
- Drop ispell dependency wrt fate#323578 rh dropped the same subpkg
in 2011
- Cleanup the dependencies to not pull in full x11 suite and depend
only on the required libs
- Build with --as-needed
- Format with spec-cleaner
-------------------------------------------------------------------
Wed Dec 7 10:38:53 UTC 2016 - maiku.fabian@gmail.com

View File

@ -1,7 +1,7 @@
#
# spec file for package m17n-lib
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -16,12 +16,12 @@
#
%define appdefdir %{_datadir}/X11
Name: m17n-lib
%define appdefdir /usr/share/X11
Version: 1.7.0
Release: 0
Summary: Multilingual Text Processing Library for the C Language
License: LGPL-2.1+ and GPL-2.0+
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
@ -30,28 +30,26 @@ Source2: baselibs.conf
Patch0: m17n-lib-fix-warnings.diff
Patch1: m17n-lib-1.7.0-fix-crash-in-marathi-transliteration.patch
BuildRequires: fdupes
BuildRequires: freetype2-devel
BuildRequires: fribidi-devel
BuildRequires: gd-devel
BuildRequires: ispell
BuildRequires: ispell-british
BuildRequires: libotf-devel
BuildRequires: libxml2
BuildRequires: m17n-db
BuildRequires: pkgconfig
BuildRequires: wordcut-devel
BuildRequires: xorg-x11-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: pkgconfig(fontconfig)
BuildRequires: pkgconfig(freetype2)
BuildRequires: pkgconfig(fribidi)
BuildRequires: pkgconfig(gdlib)
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(m17n-db)
BuildRequires: pkgconfig(wordcut)
BuildRequires: pkgconfig(xaw7)
BuildRequires: pkgconfig(xft)
%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
Requires: pkgconfig(m17n-db)
%description -n libm17n0
A multilingual text processing library for the C language.
@ -62,7 +60,8 @@ Summary: Multilingual text processing library for the C language
Group: Development/Libraries/Other
Requires: %{name} = %{version}
Requires: glibc-devel
Requires: xorg-x11-libX11-devel
BuildRequires: pkgconfig(xaw7)
BuildRequires: pkgconfig(xft)
%description devel
A multilingual text processing library for the C language
@ -73,17 +72,18 @@ A multilingual text processing library for the C language
%patch1 -p1
%build
export SUSE_ASNEEDED=0
%configure --disable-static --with-pic
make
%configure \
--disable-static
# Not thread safe at all
make -j1
%check
export MALLOC_CHECK_=2
make check
make -j1 check
unset MALLOC_CHECK_
%install
%makeinstall
%make_install INSTALL="install -p"
# Japanese 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 \
@ -96,17 +96,15 @@ iconv -f EUC-JP -t SJIS < example/M17NEdit.ja \
> %{buildroot}%{appdefdir}/ja_JP.SJIS/app-defaults/M17NEdit
iconv -f EUC-JP -t UTF-8 < example/M17NEdit.ja \
> %{buildroot}%{appdefdir}/ja_JP.UTF-8/app-defaults/M17NEdit
rm -f %{buildroot}%{_libdir}/m17n/*/*.la
rm -f %{buildroot}%{_libdir}/*.la
find %{buildroot} -type f -name "*.la" -delete -print
find %{buildroot} -type f -name "*.la" -delete -print
%fdupes %{buildroot}
%post -n libm17n0 -p /sbin/ldconfig
%postun -n libm17n0 -p /sbin/ldconfig
%files
%defattr(-, root, root)
%doc AUTHORS COPYING NEWS README ChangeLog
%{_bindir}/*
%dir %{appdefdir}/??
@ -115,12 +113,10 @@ rm -f %{buildroot}%{_libdir}/*.la
%{appdefdir}/*/app-defaults/M17NEdit
%files -n libm17n0
%defattr(-, root, root)
%{_libdir}/lib*.so.*
%{_libdir}/m17n
%files devel
%defattr(-, root, root)
%{_includedir}/*
%{_libdir}/lib*.so
%{_libdir}/pkgconfig/*.pc