Accepting request 401860 from M17N

1

OBS-URL: https://build.opensuse.org/request/show/401860
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fwnn?expand=0&rev=23

fwnn.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Mon Jun 13 22:33:24 UTC 2016 - jengelh@inai.de
+
+- Implement shared library guideline
+- Condense description to present the main idea
+- Rename development subpackages to *-devel
+
+-------------------------------------------------------------------
+Tue Jun  7 13:58:26 UTC 2016 - mpost@suse.com
+
+- Removed %{?_smp_mflags} from the make command to fix a build
+  failure on the s390x architecture.
+
 -------------------------------------------------------------------
 Fri Dec 25 16:08:38 UTC 2015 - i@marguerite.su
 

fwnn.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package fwnn
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 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
@@ -49,19 +49,8 @@ Conflicts:      wnn6
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
-FreeWnn is a Kana-Kanji translation system, originally developed by a
+FreeWnn is a Kana-Kanji translation system intended as a system
-joint project made up of Kyoto University, OMRON Corporation [formerly
+powerful enough to translate entire sentences at once.
-known as Tateishi Electronics Co.], and ASTEC Inc. Further development
-and maintenance is now done by the "FreeWnn Project"
-(http://www.freewnn.org).
-
-The name "Wnn", is an acronym for the Japanese sentence "Watashino
-Namaeha Nakanodesu" (literally, it means "my name is Nakano."), and is
-derived from a goal of the project: to develop a system powerful enough
-to translate a whole sentence like that at once.  The source code has
-been written in C and is freely distributed. Consequently, Wnn spread
-widely among workstation platforms, and became a de facto standard as a
-Kana-Kanji translation system for UNIX operating systems.
 
 Wnn works in a client/server manner. The server portion of Wnn, or
 jserver, is used as a Kana-Kanji translation engine for clients like
@@ -71,11 +60,27 @@ XEmacs.
 
 This package contains only the Japanese server.
 
+%package -n libjd0
+Summary:        FreeWnn Japanese Input System library
+Group:          System/Libraries
+
+%description -n libjd0
+This subpackage contains a core library of the Wnn input system.
+
+%package -n libwnn0
+Summary:        FreeWnn Input System library
+Group:          System/Libraries
+
+%description -n libwnn0
+This subpackage contains a core library of the Wnn input system.
+
 %package -n fwnn-devel
 Summary:        Development Library and Header Files for FreeWnn
 Group:          Development/Libraries/C and C++
-Requires:       fcwnndev = %{version}
+Requires:       fcwnn-devel = %{version}
 Requires:       fwnn = %{version}
+Requires:       libjd0 = %{version}
+Requires:       libwnn0 = %{version}
 Provides:       fwnndev = %{version}
 Obsoletes:      fwnndev < %{version}
 
@@ -117,12 +122,22 @@ This package includes the common files for the Free cWnn and Free tWnn
 Chinese Input Systems. Free cWnn is for mainland Chinese and free tWnn
 is for Taiwan-Chinese.
 
-%package -n fcwnndev
+%package -n libcwnn0
+Summary:        FreeWnn Chinese Input System library
+Group:          System/Libraries
+
+%description -n libcwnn0
+This subpackage contains a core library of the Wnn input system.
+
+%package -n fcwnn-devel
 Summary:        Development Libraries and Header Files for Free cWnn
 Group:          Development/Libraries/C and C++
 Requires:       fcwnn = %{version}
+Requires:       libcwnn0 = %{version}
+Obsoletes:      fcwnndev < %{version}-%{release}
+Provides:       fcwnndev = %{version}-%{release}
 
-%description -n fcwnndev
+%description -n fcwnn-devel
 This package contains the header files and libraries for building
 client programs that use the Chinese Input System, Free cWnn.
 
@@ -148,13 +163,22 @@ Requires(pre):	%insserv_prereq %fillup_prereq
 %description -n fkwnn
 Free kWnn Korean input system.
 
-%package -n fkwnndev
+%package -n libkwnn0
+Summary:        FreeWnn Korean Input System library
+Group:          System/Libraries
+
+%description -n libkwnn0
+This subpackage contains a core library of the Wnn input system.
+
+%package -n fkwnn-devel
 Summary:        Development Libraries and Header Files for Free kWnn
 Group:          Development/Libraries/C and C++
-Requires:       fcwnndev = %{version}
+Requires:       fcwnn-devel = %{version}
 Requires:       fkwnn = %{version}
+Obsoletes:      fwknndev < %{version}-%{release}
+Provides:       fwknndev = %{version}-%{release}
 
-%description -n fkwnndev
+%description -n fkwnn-devel
 This package contains the header files and libraries for building
 client programs that use the Korean Input System, Free kWnn.
 
@@ -204,7 +228,7 @@ client programs that use the Korean Input System, Free kWnn.
 	    --disable-client-setgid \
             --with-libwrap
 # not -j safe, see Wnn/pubdicplus/Makefile.in
-make %{?_smp_mflags}
+make
 #pushd Wnn/uum
 #make CCOPTIONS="$RPM_OPT_FLAGS"
 #popd
@@ -271,7 +295,6 @@ find %{buildroot} -type f -name "*.a" -delete -print
 %{_sbindir}/useradd -r -o -g root -u 66 -s /bin/false -c "Wnn System Account" -d %{_localstatedir}/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/*.*
@@ -282,10 +305,14 @@ 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 libjd0 -p /sbin/ldconfig
+%postun -n libjd0 -p /sbin/ldconfig
+%post   -n libwnn0 -p /sbin/ldconfig
+%postun -n libwnn0 -p /sbin/ldconfig
+
 %pre -n fwnncom
 %{_sbindir}/useradd -r -o -g root -u 66 -s /bin/false -c "Wnn System Account" -d %{_localstatedir}/lib/wnn wnn 2> /dev/null || :
 
@@ -299,17 +326,18 @@ 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
 
+%post   -n libcwnn0 -p /sbin/ldconfig
+%postun -n libcwnn0 -p /sbin/ldconfig
+
 %pre -n ftwnn
 %{_sbindir}/useradd -r -o -g root -u 66 -s /bin/false -c "Wnn System Account" -d %{_localstatedir}/lib/wnn wnn 2> /dev/null || :
 
@@ -333,17 +361,18 @@ 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
 
+%post   -n libkwnn0 -p /sbin/ldconfig
+%postun -n libkwnn0 -p /sbin/ldconfig
+
 %files
 %defattr(-,root,root)
 %config %{_initddir}/fwnn
@@ -393,7 +422,13 @@ chroot . usr/bin/kwnntouch var/lib/wnn/ko_KR/dic/sys/*.*
 %config %{_sysconfdir}/FreeWnn/lt_LN/uumkey
 %config %{_sysconfdir}/FreeWnn/lt_LN/uumkey_e
 %config %{_sysconfdir}/FreeWnn/lt_LN/uumrc
+
+%files -n libjd0
+%defattr(-,root,root)
 %{_libdir}/libjd.so.0*
+
+%files -n libwnn0
+%defattr(-,root,root)
 %{_libdir}/libwnn.so.0*
 
 %files -n fwnn-devel
@@ -456,6 +491,9 @@ chroot . usr/bin/kwnntouch var/lib/wnn/ko_KR/dic/sys/*.*
 %config %{_sysconfdir}/FreeWnn/zh_CN/wnnenvrc_Wu
 %config %{_sysconfdir}/FreeWnn/zh_CN/wnnenvrc_WuR
 %config %{_sysconfdir}/FreeWnn/zh_CN/wnnstat.msg
+
+%files -n libcwnn0
+%defattr(-,root,root)
 %{_libdir}/libcwnn.so.0*
 
 %files -n fcwnncom
@@ -470,7 +508,7 @@ chroot . usr/bin/kwnntouch var/lib/wnn/ko_KR/dic/sys/*.*
 %{_bindir}/cwnntouch
 %{_bindir}/cuum
 
-%files -n fcwnndev
+%files -n fcwnn-devel
 %defattr(-,root,root)
 %{_includedir}/cwnn/
 %{_libdir}/libcwnn.so
@@ -537,9 +575,12 @@ chroot . usr/bin/kwnntouch var/lib/wnn/ko_KR/dic/sys/*.*
 %config %{_sysconfdir}/FreeWnn/ko_KR/wnnenvrc
 %config %{_sysconfdir}/FreeWnn/ko_KR/wnnenvrc_R
 %config %{_sysconfdir}/FreeWnn/ko_KR/wnnstat.msg
+
+%files -n libkwnn0
+%defattr(-,root,root)
 %{_libdir}/libkwnn.so.0*
 
-%files -n fkwnndev
+%files -n fkwnn-devel
 %defattr(-,root,root)
 %{_includedir}/kwnn/
 %{_libdir}/libkwnn.so