diff --git a/fwnn.changes b/fwnn.changes index 2bf3851..5b894ea 100644 --- a/fwnn.changes +++ b/fwnn.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Aug 29 01:00:22 CEST 2008 - cthiel@suse.de + +- fix init script + ------------------------------------------------------------------- Sat May 26 23:48:53 CEST 2007 - ro@suse.de diff --git a/fwnn.spec b/fwnn.spec index 3cb62e0..8ab7415 100644 --- a/fwnn.spec +++ b/fwnn.spec @@ -1,28 +1,36 @@ # # spec file for package fwnn (Version 1.1.1a017) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. +# Copyright (c) 2008 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 +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild + Name: fwnn BuildRequires: ncurses-devel termcap %define base_version 1.1.1 %define alpha_version a017 -License: GNU General Public License (GPL) +License: GPL v2 or later Group: System/I18n/Japanese Requires: fwnncom Conflicts: wnn6 -Prereq: /usr/sbin/useradd %insserv_prereq %fillup_prereq -Autoreqprov: on +PreReq: /usr/sbin/useradd %insserv_prereq %fillup_prereq +AutoReqProv: on Version: 1.1.1a017 -Release: 597 -URL: http://www.freewnn.org +Release: 672 +Url: http://www.freewnn.org BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: FreeWnn Japanese Input System--Server Only Source: ftp://ftp.etl.go.jp/pub/FreeWnn/alpha/FreeWnn-%{base_version}-%{alpha_version}.tar.bz2 @@ -91,6 +99,7 @@ This package contains only the Japanese server. %package -n fwnn-devel +License: GPL v2 or later Group: Development/Libraries/C and C++ Summary: Development Library and Header Files for FreeWnn Provides: fwnndev @@ -108,9 +117,10 @@ client programs which use FreeWnn for Japanese input. %package -n fwnncom +License: GPL v2 or later Summary: Common Files for FreeWnn Group: System/I18n/Japanese -Prereq: /usr/sbin/useradd +PreReq: /usr/sbin/useradd %description -n fwnncom This package includes files you need to run FreeWnn, Free cWnn, Free @@ -120,9 +130,10 @@ of the Wnn System. %package -n fcwnn +License: GPL v2 or later Group: System/I18n/Chinese Requires: fwnncom, fcwnncom -Prereq: /usr/sbin/useradd fcwnncom +PreReq: /usr/sbin/useradd fcwnncom Summary: Free cWnn Chinese Input System (Mainland China) # Summary(ja): Free cWnn 中国語の入力システム (中華人民共和国) # %description -n fcwnn -l ja @@ -135,10 +146,11 @@ Free cWnn Chinese Input System (mainland China). %package -n fcwnncom +License: GPL v2 or later Summary: Free cWnn/tWnn Chinese Input System Common Files (Mainland and Taiwan) Group: System/I18n/Chinese Requires: fwnncom -Prereq: /usr/sbin/useradd +PreReq: /usr/sbin/useradd %description -n fcwnncom This package includes the common files for the Free cWnn and Free tWnn @@ -148,6 +160,7 @@ is for Taiwan-Chinese. %package -n fcwnndev +License: GPL v2 or later Group: Development/Libraries/C and C++ Summary: Development Libraries and Header Files for Free cWnn # Summary(ja): Free cWnn 用開発ライブラリとヘッダファイル @@ -163,10 +176,11 @@ client programs that use the Chinese Input System, Free cWnn. %package -n ftwnn +License: GPL v2 or later Summary: Free tWnn Chinese Input System (Taiwan) Group: System/I18n/Chinese Requires: fwnncom, fcwnncom -Prereq: /usr/sbin/useradd, fcwnncom +PreReq: /usr/sbin/useradd, fcwnncom # Summary(ja): Free tWnn 中国語の入力システム (台湾) # %description -n ftwnn -l ja # @@ -178,10 +192,11 @@ Free tWnn Chinese input system (Taiwan). %package -n fkwnn +License: GPL v2 or later Summary: Free kWnn Korean Input System Group: System/I18n/Korean Requires: fwnncom -Prereq: /usr/sbin/useradd +PreReq: /usr/sbin/useradd # Summary(ja): Free kWnn 韓国語の入力システム # %description -n fkwnn -l ja # @@ -193,6 +208,7 @@ Free kWnn Korean input system. %package -n fkwnndev +License: GPL v2 or later Group: Development/Libraries/C and C++ Summary: Development Libraries and Header Files for Free kWnn # Summary(ja): Free kWnn 用開発ライブラリとヘッダファイル @@ -333,7 +349,7 @@ ln -sf /var/lib/wnn/ko_KR/dic ${RPM_BUILD_ROOT}/etc/FreeWnn/ko_KR/dic chroot . usr/bin/wnntouch var/lib/wnn/ja/dic/gerodic/g-jinmei.dic chroot . usr/bin/wnntouch var/lib/wnn/ja/dic/pubdic/*.* # Create symbolic runlevel links: -%{fillup_and_insserv -sy fwnn START_FREE_WNN} +%{fillup_and_insserv -y} %preun -n fwnn %stop_on_removal fwnn @@ -358,7 +374,7 @@ chroot . usr/bin/wnntouch var/lib/wnn/ja/dic/pubdic/*.* # touch all public dictionary files: chroot . usr/bin/cwnntouch var/lib/wnn/zh_CN/dic/sys/*.* # Create symbolic run level links: -%{fillup_and_insserv -s fcwnn START_FREE_CWNN} +%{fillup_and_insserv} %postun -n fcwnn %restart_on_update fcwnn @@ -377,7 +393,7 @@ chroot . usr/bin/cwnntouch var/lib/wnn/zh_CN/dic/sys/*.* # touch all public dictionary files: chroot . usr/bin/cwnntouch var/lib/wnn/zh_TW/dic/sys/*.* # Create symbolic run level links: -%{fillup_and_insserv -s ftwnn START_FREE_TWNN} +%{fillup_and_insserv} %postun -n ftwnn %restart_on_update ftwnn @@ -393,7 +409,7 @@ chroot . usr/bin/cwnntouch var/lib/wnn/zh_TW/dic/sys/*.* # touch all public dictionary files: chroot . usr/bin/kwnntouch var/lib/wnn/ko_KR/dic/sys/*.* # Create symbolic run level links: -%{fillup_and_insserv -s fkwnn START_FREE_KWNN} +%{fillup_and_insserv} %postun -n fkwnn %restart_on_update fkwnn @@ -651,89 +667,91 @@ chroot . usr/bin/kwnntouch var/lib/wnn/ko_KR/dic/sys/*.* # %config /var/lib/wnn/cvt_xim_tbl %changelog -* Sat May 26 2007 - ro@suse.de +* Fri Aug 29 2008 cthiel@suse.de +- fix init script +* Sun May 27 2007 ro@suse.de - rename fwnndev subpackage to fwnn-devel -* Fri Mar 30 2007 - ro@suse.de +* Fri Mar 30 2007 ro@suse.de - added ncurses-devel to buildreq -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Sat Jan 14 2006 - schwab@suse.de +* Sun Jan 15 2006 schwab@suse.de - Don't strip binaries. - Don't build as root. -* Fri Oct 21 2005 - mmj@suse.de +* Fri Oct 21 2005 mmj@suse.de - fix missing return value -* Thu Sep 22 2005 - yxu@suse.de +* Thu Sep 22 2005 yxu@suse.de - add needed prototypes -* Wed Jun 15 2005 - meissner@suse.de +* Wed Jun 15 2005 meissner@suse.de - Use RPM_OPT_FLAGS. - Add lots of include files to avoid implicit declarations - Use system getopt and bsearch. - Fixed bad atoi() call spotted by -Wall -* Wed Apr 13 2005 - mfabian@suse.de +* Wed Apr 13 2005 mfabian@suse.de - make it build on STABLE again: conflicting-prototypes.patch -* Tue Jun 08 2004 - ro@suse.de +* Tue Jun 08 2004 ro@suse.de - get rid of some compiler warnings -* Mon Sep 15 2003 - mfabian@suse.de +* Mon Sep 15 2003 mfabian@suse.de - Bugzilla #30921: /var/lib/wnn should be owned by user "wnn" for all subpackages. -* Mon Aug 18 2003 - mfabian@suse.de +* Mon Aug 18 2003 mfabian@suse.de - Use new stop_on_removal/restart_on_upate macros -* Mon Jun 16 2003 - mfabian@suse.de +* Mon Jun 16 2003 mfabian@suse.de - fix "directory not owned by any package". -* Sun Nov 03 2002 - mfabian@suse.de +* Sun Nov 03 2002 mfabian@suse.de - Bug Id #17416: fix usage of socket API to make /usr/bin/jserver work on s390x. Thanks to for help. -* Fri Sep 13 2002 - mfabian@suse.de +* Fri Sep 13 2002 mfabian@suse.de - change "network route named" -> "$network $named" in "# Required-Start:". -* Thu Aug 01 2002 - mfabian@suse.de +* Thu Aug 01 2002 mfabian@suse.de - add %%insserv_prereq %%fillup_prereq to Prereq: -* Wed Jul 24 2002 - mfabian@suse.de +* Wed Jul 24 2002 mfabian@suse.de - Don't parse rc.config in init scripts - change usage of useradd in pre script to comply with the package howto - move home-dir into fwnncom sub package (fwnncom is required by all other *wnn* packages). -* Tue Jul 02 2002 - ro@suse.de +* Tue Jul 02 2002 ro@suse.de - added home-dir to base package -* Thu Apr 11 2002 - mfabian@suse.de +* Thu Apr 11 2002 mfabian@suse.de - use %%{_libdir} and add FreeWnn-lib64.patch from -* Thu Jan 10 2002 - egmont@suselinux.hu +* Thu Jan 10 2002 egmont@suselinux.hu - changed /sbin/init.d to /etc/init.d in init script comments -* Fri Dec 07 2001 - mfabian@suse.de +* Fri Dec 07 2001 mfabian@suse.de - get rid of START_* variables in /etc/rc.config: use new macros fill_up_and_insserv and insserv_cleanup and remove testing for START_* variables from init scripts. -* Thu Sep 06 2001 - mfabian@suse.de +* Thu Sep 06 2001 mfabian@suse.de - set START_FREE_TWNN="no", START_FREE_KWNN="no", START_FREE_CWNN="no", -* Tue Sep 04 2001 - schwab@suse.de +* Tue Sep 04 2001 schwab@suse.de - Add prototypes for C++, constify. -* Mon May 07 2001 - mfabian@suse.de +* Mon May 07 2001 mfabian@suse.de - bzip2 sources -* Thu May 03 2001 - mfabian@suse.de +* Thu May 03 2001 mfabian@suse.de - make init scripts comply with latest LSB spec -* Tue Dec 05 2000 - schwab@suse.de +* Tue Dec 05 2000 schwab@suse.de - Fix missing declarations. -* Tue Nov 28 2000 - mfabian@suse.de +* Tue Nov 28 2000 mfabian@suse.de - forgot to change the links to the init scripts to /etc/init.d fixed. -* Mon Nov 27 2000 - mfabian@suse.de +* Tue Nov 28 2000 mfabian@suse.de - removed sockets before starting the FreeWnn servers. sometimes these sockets remained after killing a FreeWnn server, which prevented the restart. -* Mon Nov 27 2000 - mfabian@suse.de +* Mon Nov 27 2000 mfabian@suse.de - added "route named" to "Required-Start:" - moved init scripts to /etc/init.d -* Fri Nov 24 2000 - mfabian@suse.de +* Fri Nov 24 2000 mfabian@suse.de - change to new init script mechanism: rewrote the init scripts to use insserv to handle links to init scripts. -* Wed Nov 01 2000 - mfabian@suse.de +* Wed Nov 01 2000 mfabian@suse.de - made the command line client "uum" work. -* Mon Oct 30 2000 - mfabian@suse.de +* Mon Oct 30 2000 mfabian@suse.de - moved all manpages into the fwnncom subpackage -* Fri Oct 27 2000 - bk@suse.de +* Fri Oct 27 2000 bk@suse.de - fixed startproc call, useradd and server permissions -* Wed Oct 25 2000 - mfabian@suse.de +* Wed Oct 25 2000 mfabian@suse.de - new package: fwnn (FreeWnn, Version 1.1.1-a017) diff --git a/rcfcwnn b/rcfcwnn index 446ded8..e7cbc8b 100644 --- a/rcfcwnn +++ b/rcfcwnn @@ -7,8 +7,8 @@ # ### BEGIN INIT INFO # Provides: fcwnn -# Required-Start: $network $named -# Required-Stop: +# Required-Start: $network $remote_fs $named +# Required-Stop: $network $remote_fs $named # Default-Start: 3 5 # Default-Stop: # Description: Free Wnn (mainland) Chinese Server, for input of simplified Chinese diff --git a/rcfkwnn b/rcfkwnn index 69517d3..def82d2 100644 --- a/rcfkwnn +++ b/rcfkwnn @@ -7,8 +7,8 @@ # ### BEGIN INIT INFO # Provides: fkwnn -# Required-Start: $network $named -# Required-Stop: +# Required-Start: $network $remote_fs $named +# Required-Stop: $network $remote_fs $named # Default-Start: 3 5 # Default-Stop: # Description: Free Wnn Korean Server, for input of Korean diff --git a/rcftwnn b/rcftwnn index 76e0204..e282a07 100644 --- a/rcftwnn +++ b/rcftwnn @@ -7,8 +7,8 @@ # ### BEGIN INIT INFO # Provides: ftwnn -# Required-Start: $network $named -# Required-Stop: +# Required-Start: $network $remote_fs $named +# Required-Stop: $network $remote_fs $named # Default-Start: 3 5 # Default-Stop: # Description: Free Wnn Taiwan-Chinese Server, for input of traditional Chinese diff --git a/rcfwnn b/rcfwnn index 42130ce..8ad61dc 100644 --- a/rcfwnn +++ b/rcfwnn @@ -7,8 +7,8 @@ # ### BEGIN INIT INFO # Provides: fwnn -# Required-Start: $network $named -# Required-Stop: +# Required-Start: $network $remote_fs $named +# Required-Stop: $network $remote_fs $named # Default-Start: 3 5 # Default-Stop: # Description: Free Wnn Kanji Server used for input of Japanese