Accepting request 145601 from M17N

- Require library packages in devel packages
- Run ldconfig in %post/%postun (forwarded request 145598 from AndreasSchwab)

OBS-URL: https://build.opensuse.org/request/show/145601
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fwnn?expand=0&rev=16
This commit is contained in:
Stephan Kulow 2012-12-19 09:54:59 +00:00 committed by Git OBS Bridge
commit 08c997e305
2 changed files with 21 additions and 9 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun Dec 16 21:19:31 UTC 2012 - schwab@linux-m68k.org
- Require library packages in devel packages
- Run ldconfig in %post/%postun
-------------------------------------------------------------------
Tue Dec 20 20:31:49 UTC 2011 - coolo@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package fwnn
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2012 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
@ -15,6 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: fwnn
BuildRequires: ncurses-devel
BuildRequires: termcap
@ -98,6 +99,7 @@ This package contains only the Japanese server.
%package -n fwnn-devel
Summary: Development Library and Header Files for FreeWnn
Group: Development/Libraries/C and C++
Requires: fwnn = %{version}
Provides: fwnndev
Obsoletes: fwnndev
# Summary(ja): FreeWnn 用開発ライブラリとヘッダファイル
@ -125,7 +127,8 @@ of the Wnn System.
%package -n fcwnn
Requires: fwnncom, fcwnncom
Requires: fcwnncom
Requires: fwnncom
PreReq: /usr/sbin/useradd fcwnncom
Summary: Free cWnn Chinese Input System (Mainland China)
Group: System/I18n/Chinese
@ -155,6 +158,7 @@ is for Taiwan-Chinese.
%package -n fcwnndev
Summary: Development Libraries and Header Files for Free cWnn
Group: Development/Libraries/C and C++
Requires: fcwnn = %{version}
# Summary(ja): Free cWnn 用開発ライブラリとヘッダファイル
# %description -n fcwnndev -l ja
#
@ -170,7 +174,8 @@ client programs that use the Chinese Input System, Free cWnn.
%package -n ftwnn
Summary: Free tWnn Chinese Input System (Taiwan)
Group: System/I18n/Chinese
Requires: fwnncom, fcwnncom
Requires: fcwnncom
Requires: fwnncom
PreReq: /usr/sbin/useradd, fcwnncom
# Summary(ja): Free tWnn 中国語の入力システム (台湾)
# %description -n ftwnn -l ja
@ -200,6 +205,7 @@ Free kWnn Korean input system.
%package -n fkwnndev
Summary: Development Libraries and Header Files for Free kWnn
Group: Development/Libraries/C and C++
Requires: fkwnn = %{version}
# Summary(ja): Free kWnn 用開発ライブラリとヘッダファイル
# %description -n fkwnndev -l ja
#
@ -333,6 +339,7 @@ rm -f ${RPM_BUILD_ROOT}/%{_libdir}/lib*.la
/usr/sbin/useradd -r -o -g root -u 66 -s /bin/false -c "Wnn System Account" -d /var/lib/wnn wnn 2> /dev/null || :
%post -n fwnn
/sbin/ldconfig
# touch all public dictionary files:
chroot . usr/bin/wnntouch var/lib/wnn/ja/dic/gerodic/g-jinmei.dic
chroot . usr/bin/wnntouch var/lib/wnn/ja/dic/pubdic/*.*
@ -343,6 +350,7 @@ chroot . usr/bin/wnntouch var/lib/wnn/ja/dic/pubdic/*.*
%stop_on_removal fwnn
%postun -n fwnn
/sbin/ldconfig
%restart_on_update fwnn
%insserv_cleanup
#%post -n fwnn-devel
@ -359,17 +367,16 @@ chroot . usr/bin/wnntouch var/lib/wnn/ja/dic/pubdic/*.*
%stop_on_removal fcwnn
%post -n fcwnn
/sbin/ldconfig
# touch all public dictionary files:
chroot . usr/bin/cwnntouch var/lib/wnn/zh_CN/dic/sys/*.*
# Create symbolic run level links:
%{fillup_and_insserv}
%postun -n fcwnn
/sbin/ldconfig
%restart_on_update fcwnn
%insserv_cleanup
#%postun -n fcwnndev
# if you make libwnn.so, unomment it.
#/sbin/ldconfig
%pre -n ftwnn
/usr/sbin/useradd -r -o -g root -u 66 -s /bin/false -c "Wnn System Account" -d /var/lib/wnn wnn 2> /dev/null || :
@ -394,17 +401,16 @@ chroot . usr/bin/cwnntouch var/lib/wnn/zh_TW/dic/sys/*.*
%stop_on_removal fkwnn
%post -n fkwnn
/sbin/ldconfig
# touch all public dictionary files:
chroot . usr/bin/kwnntouch var/lib/wnn/ko_KR/dic/sys/*.*
# Create symbolic run level links:
%{fillup_and_insserv}
%postun -n fkwnn
/sbin/ldconfig
%restart_on_update fkwnn
%insserv_cleanup
#%postun -n fkwnndev
# if you make libwnn.so, unomment it.
#/sbin/ldconfig
%files
%defattr(-,root,root)