From f657762af100df62935abdc074821573cceb3a5e9bdf29e91d92ccd765f3129a Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Wed, 16 Sep 2015 10:20:01 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/M17N/fwnn?expand=0&rev=14 --- FreeWnn-warnings.patch | 13 +++++++++++ fwnn.changes | 8 +++++++ fwnn.spec | 52 ++++++++++++++++++++++++------------------ 3 files changed, 51 insertions(+), 22 deletions(-) diff --git a/FreeWnn-warnings.patch b/FreeWnn-warnings.patch index 877167d..4e8913b 100644 --- a/FreeWnn-warnings.patch +++ b/FreeWnn-warnings.patch @@ -18,3 +18,16 @@ /* pw_d pw_h err mes */ return (-1); if (js_dic_info (jl_env (buf), dic_no, &ret) < 0) +--- Wnn/etc/pwd.c ++++ Wnn/etc/pwd.c 2015-09-16 10:04:15.545979775 +0000 +@@ -51,6 +51,10 @@ + #include "commonhd.h" + #include "jslib.h" + #include "wnn_os.h" ++#else ++#include ++#include ++#include + #endif /* !JS */ + + #ifdef JS diff --git a/fwnn.changes b/fwnn.changes index 01525cd..d2d1499 100644 --- a/fwnn.changes +++ b/fwnn.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Sep 16 10:11:56 UTC 2015 - werner@suse.de + +- Some cleanups like + + use the same owner for /var/lib/wnn as the package canna does + + mark configuration files as configuration files + + avoid warning due missed header files + ------------------------------------------------------------------- Sat Sep 12 08:31:21 UTC 2015 - i@marguerite.su diff --git a/fwnn.spec b/fwnn.spec index 7e1d077..cea0a40 100644 --- a/fwnn.spec +++ b/fwnn.spec @@ -356,9 +356,9 @@ chroot . usr/bin/kwnntouch var/lib/wnn/ko_KR/dic/sys/*.* %{_bindir}/wnnkill %{_bindir}/uum %{_bindir}/wnntouch -%dir %{_localstatedir}/lib/wnn/ -%dir %{_localstatedir}/lib/wnn/ja/ -%{_localstatedir}/lib/wnn/ja/dic +%dir %attr(-,wnn,root) %{_localstatedir}/lib/wnn/ +%dir %attr(-,wnn,root) %{_localstatedir}/lib/wnn/ja/ +%attr(-,wnn,root) %{_localstatedir}/lib/wnn/ja/dic %dir %{_sysconfdir}/FreeWnn/ja/ %{_sysconfdir}/FreeWnn/ja/dic %config %{_sysconfdir}/FreeWnn/ja/hinsi.data @@ -384,7 +384,8 @@ chroot . usr/bin/kwnntouch var/lib/wnn/ko_KR/dic/sys/*.* %config %{_sysconfdir}/FreeWnn/ja/wnnenvrc_R.rem %config %{_sysconfdir}/FreeWnn/ja/wnnstat.msg %dir %{_sysconfdir}/FreeWnn/lt_LN/ -%{_sysconfdir}/FreeWnn/lt_LN/rk +%dir %{_sysconfdir}/FreeWnn/lt_LN/rk +%config %{_sysconfdir}/FreeWnn/lt_LN/rk/* %config %{_sysconfdir}/FreeWnn/lt_LN/uum.msg %config %{_sysconfdir}/FreeWnn/lt_LN/uumkey %config %{_sysconfdir}/FreeWnn/lt_LN/uumkey_e @@ -407,7 +408,7 @@ chroot . usr/bin/kwnntouch var/lib/wnn/ko_KR/dic/sys/*.* %dir %{_mandir}/ja/ %dir %{_mandir}/ja/*/ %{_mandir}/ja/man?/* -%dir %{_localstatedir}/lib/wnn +%dir %attr(-,wnn,root) %{_localstatedir}/lib/wnn %dir %{_sysconfdir}/FreeWnn/ %config %{_sysconfdir}/FreeWnn/cvt_key_empty %config %{_sysconfdir}/FreeWnn/cvt_key_tbl @@ -426,19 +427,22 @@ chroot . usr/bin/kwnntouch var/lib/wnn/ko_KR/dic/sys/*.* %config %{_sysconfdir}/FreeWnn/zh_CN/cixing.data %config %{_sysconfdir}/FreeWnn/zh_CN/cserverrc %{_sysconfdir}/FreeWnn/zh_CN/dic -%dir %{_localstatedir}/lib/wnn/ -%dir %{_localstatedir}/lib/wnn/zh_CN/ +%dir %attr(-,wnn,root) %{_localstatedir}/lib/wnn/ +%dir %attr(-,wnn,root) %{_localstatedir}/lib/wnn/zh_CN/ %{_localstatedir}/lib/wnn/zh_CN/dic %config %{_sysconfdir}/FreeWnn/zh_CN/libwnn.msg %dir %{_sysconfdir}/FreeWnn/ %dir %{_sysconfdir}/FreeWnn/zh_CN/ -%{_sysconfdir}/FreeWnn/zh_CN/rk -%{_sysconfdir}/FreeWnn/zh_CN/rk_p -%{_sysconfdir}/FreeWnn/zh_CN/rk_z -%{_sysconfdir}/FreeWnn/zh_CN/uum.msg -%{_sysconfdir}/FreeWnn/zh_CN/uumkey -%{_sysconfdir}/FreeWnn/zh_CN/uumkey_e -%{_sysconfdir}/FreeWnn/zh_CN/uumkey_p +%dir %{_sysconfdir}/FreeWnn/zh_CN/rk +%dir %{_sysconfdir}/FreeWnn/zh_CN/rk_p +%dir %{_sysconfdir}/FreeWnn/zh_CN/rk_z +%config %{_sysconfdir}/FreeWnn/zh_CN/rk/* +%config %{_sysconfdir}/FreeWnn/zh_CN/rk_p/* +%config %{_sysconfdir}/FreeWnn/zh_CN/rk_z/* +%config %{_sysconfdir}/FreeWnn/zh_CN/uum.msg +%config %{_sysconfdir}/FreeWnn/zh_CN/uumkey +%config %{_sysconfdir}/FreeWnn/zh_CN/uumkey_e +%config %{_sysconfdir}/FreeWnn/zh_CN/uumkey_p %config %{_sysconfdir}/FreeWnn/zh_CN/uumrc %config %{_sysconfdir}/FreeWnn/zh_CN/uumrc_p %config %{_sysconfdir}/FreeWnn/zh_CN/uumrc_z @@ -475,15 +479,18 @@ chroot . usr/bin/kwnntouch var/lib/wnn/ko_KR/dic/sys/*.* %{_bindir}/tserver %config %{_sysconfdir}/FreeWnn/zh_TW/cixing.data %{_sysconfdir}/FreeWnn/zh_TW/dic -%dir %{_localstatedir}/lib/wnn/ -%dir %{_localstatedir}/lib/wnn/zh_TW/ +%dir %attr(-,wnn,root) %{_localstatedir}/lib/wnn/ +%dir %attr(-,wnn,root) %{_localstatedir}/lib/wnn/zh_TW/ %{_localstatedir}/lib/wnn/zh_TW/dic %config %{_sysconfdir}/FreeWnn/zh_TW/libwnn.msg %dir %{_sysconfdir}/FreeWnn/ %dir %{_sysconfdir}/FreeWnn/zh_TW/ -%{_sysconfdir}/FreeWnn/zh_TW/rk -%{_sysconfdir}/FreeWnn/zh_TW/rk_p -%{_sysconfdir}/FreeWnn/zh_TW/rk_z +%dir %{_sysconfdir}/FreeWnn/zh_TW/rk +%dir %{_sysconfdir}/FreeWnn/zh_TW/rk_p +%dir %{_sysconfdir}/FreeWnn/zh_TW/rk_z +%config %{_sysconfdir}/FreeWnn/zh_TW/rk/* +%config %{_sysconfdir}/FreeWnn/zh_TW/rk_p/* +%config %{_sysconfdir}/FreeWnn/zh_TW/rk_z/* %config %{_sysconfdir}/FreeWnn/zh_TW/tserverrc %config %{_sysconfdir}/FreeWnn/zh_TW/uum.msg %config %{_sysconfdir}/FreeWnn/zh_TW/uumkey @@ -513,13 +520,14 @@ chroot . usr/bin/kwnntouch var/lib/wnn/ko_KR/dic/sys/*.* %dir %{_sysconfdir}/FreeWnn/ %dir %{_sysconfdir}/FreeWnn/ko_KR/ %{_sysconfdir}/FreeWnn/ko_KR/dic -%dir %{_localstatedir}/lib/wnn/ -%dir %{_localstatedir}/lib/wnn/ko_KR/ +%dir %attr(-,wnn,root) %{_localstatedir}/lib/wnn/ +%dir %attr(-,wnn,root) %{_localstatedir}/lib/wnn/ko_KR/ %{_localstatedir}/lib/wnn/ko_KR/dic %config %{_sysconfdir}/FreeWnn/ko_KR/hinsi.data %config %{_sysconfdir}/FreeWnn/ko_KR/kserverrc %config %{_sysconfdir}/FreeWnn/ko_KR/libwnn.msg -%{_sysconfdir}/FreeWnn/ko_KR/rk +%dir %{_sysconfdir}/FreeWnn/ko_KR/rk +%config %{_sysconfdir}/FreeWnn/ko_KR/rk/* %config %{_sysconfdir}/FreeWnn/ko_KR/uum.msg %config %{_sysconfdir}/FreeWnn/ko_KR/uumkey %config %{_sysconfdir}/FreeWnn/ko_KR/uumrc