Hello community, here is the log from the commit of package fwnn for openSUSE:Factory checked in at 2019-03-26 15:42:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fwnn (Old) and /work/SRC/openSUSE:Factory/.fwnn.new.25356 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fwnn" Tue Mar 26 15:42:30 2019 rev:25 rq:685498 version:1.1.1a023.1 Changes: -------- --- /work/SRC/openSUSE:Factory/fwnn/fwnn.changes 2017-11-24 10:57:25.249819870 +0100 +++ /work/SRC/openSUSE:Factory/.fwnn.new.25356/fwnn.changes 2019-03-26 15:43:23.816210485 +0100 @@ -1,0 +2,26 @@ +Sat Mar 16 03:14:29 UTC 2019 - bkbin...@rinku.zaq.ne.jp + +- Remove tarball's URL: Upstream hasn't released tarball yet. + +------------------------------------------------------------------- +Fri Mar 15 21:24:15 UTC 2019 - Jan Engelhardt <jeng...@inai.de> + +- Do not hide errors coming from useradd. + +------------------------------------------------------------------- +Sat Mar 9 07:51:43 UTC 2019 - bkbin...@rinku.zaq.ne.jp + +- Update to FreeWnn-1.1.1-a023.1: + * Deal with "Reproducible Buids". + See <https://osdn.net/projects/freewnn/ticket/38482>. +- Remove FreeWnn-trad_cpp.patch: doesn't seem to need. + +------------------------------------------------------------------- +Thu Mar 7 13:22:01 UTC 2019 - josef.moell...@suse.com + +- Added systemd support: Replaced sysv init files by systemd + service files. + [bsc#1116014,fwnn.service,fcwnn.service,fkwnn.service, + ftwnn.service] + +------------------------------------------------------------------- Old: ---- FreeWnn-1.1.1-a023.tar.gz FreeWnn-trad_cpp.patch rcfcwnn rcfkwnn rcftwnn rcfwnn New: ---- FreeWnn-1.1.1-a023.1.tar.xz FreeWnn-1.1.1-a023.1.tar.xz.asc _service fcwnn.service fkwnn.service ftwnn.service fwnn.keyring fwnn.service ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fwnn.spec ++++++ --- /var/tmp/diff_new_pack.oF7UFE/_old 2019-03-26 15:43:24.992209812 +0100 +++ /var/tmp/diff_new_pack.oF7UFE/_new 2019-03-26 15:43:24.996209810 +0100 @@ -1,7 +1,7 @@ # # spec file for package fwnn # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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,25 +16,26 @@ # -#Compat macro for new _fillupdir macro introduced in Nov 2017 -%if ! %{defined _fillupdir} - %define _fillupdir /var/adm/fillup-templates -%endif - %define base_version 1.1.1 -%define alpha_version a023 +%define alpha_version a023.1 Name: fwnn -Version: 1.1.1a023 +Version: 1.1.1a023.1 Release: 0 Summary: FreeWnn Japanese Input System--Server Only -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/I18n/Japanese Url: http://freewnn.sourceforge.jp/ -Source: http://iij.dl.osdn.jp/freewnn/63271/FreeWnn-%{base_version}-%{alpha_version}.tar.gz -Source1: rcfwnn -Source2: rcfcwnn -Source3: rcftwnn -Source4: rcfkwnn +# Upstream hasn't released tarball yet. +# I entered the following commands. +# cvs -d :pserver:anonym...@cvs.osdn.net:/cvsroot/freewnn export -r freewnn-1-1-1-a023-1 -d FreeWnn-1.1.1-a023.1 FreeWnn +# tar --xz -cf FreeWnn-1.1.1-a023.1.tar.xz FreeWnn-1.1.1-a023.1 +Source: FreeWnn-%{base_version}-%{alpha_version}.tar.xz +Source1: FreeWnn-%{base_version}-%{alpha_version}.tar.xz.asc +Source2: %{name}.keyring +Source5: fwnn.service +Source6: fcwnn.service +Source7: fkwnn.service +Source8: ftwnn.service Source99: fwnn-rpmlintrc Patch0: FreeWnn-fsstnd.patch Patch1: FreeWnn-ja.patch @@ -42,14 +43,12 @@ Patch2: FreeWnn-noroot.patch Patch7: FreeWnn-s390x.patch Patch8: FreeWnn-warnings.patch -Patch14: FreeWnn-trad_cpp.patch BuildRequires: fdupes BuildRequires: ncurses-devel BuildRequires: tcpd-devel Requires: fwnncom = %{version} -# %{_sbindir}/useradd +# %%{_sbindir}/useradd Requires(pre): shadow -Requires(pre): %insserv_prereq %fillup_prereq Conflicts: wnn6 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -110,7 +109,6 @@ Requires: fkwnn = %{version} Requires: fwnn = %{version} Requires(pre): shadow -Requires(pre): %insserv_prereq %fillup_prereq Requires(post): fcwnncom %description -n fcwnn @@ -152,7 +150,6 @@ Requires: fcwnn = %{version} Requires: fcwnncom = %{version} Requires(pre): shadow -Requires(pre): %insserv_prereq %fillup_prereq Requires(post): fcwnncom %description -n ftwnn @@ -163,7 +160,6 @@ Group: System/I18n/Korean Requires: fwnncom = %{version} Requires(pre): shadow -Requires(pre): %insserv_prereq %fillup_prereq %description -n fkwnn Free kWnn Korean input system. @@ -190,13 +186,13 @@ ###################################################################### # package xwnmo # I don't know how to build xwnmo. Will try that later ... -# %package -n xwnmo +# %%package -n xwnmo # Requires: wnn # Summary: xwnmo - Input Manager for the X11 Window System # Summary(ja): xwnmo - Ｘウィンドウ・インプットマネージャー # Group: Applications/X11 # -# %description -n xwnmo +# %%description -n xwnmo # # Xwnmo is a input manager for the Input Method of the X Window System. # It is based on the X11 Input Method Specifications. It provides a @@ -212,14 +208,13 @@ %patch2 -p1 %patch7 -p2 -b .s390x %patch8 -%patch14 -p1 -#%setup -b 1 -n Xsi # add include-files for Xwnmo +#%%setup -b 1 -n Xsi # add include-files for Xwnmo # SuSE setlocale patch, try to set LC_CTYPE if LC_ALL fails (Xwnmo) and #...................................................................... -# %patch2 -p1 +# %%patch2 -p1 # Trying to make Xwnmo work... #.................................................................. -# %patch3 -p1 +# %%patch3 -p1 %build %configure --prefix=%{_prefix} \ @@ -270,22 +265,16 @@ do mv %{buildroot}/%{_mandir}/man5/$i %{buildroot}/%{_mandir}/ja/man5/ done -#---------------------------------------------------------------------- -# Make sure directories for of boot script installation exist: -mkdir -p %{buildroot}%{_sysconfdir}/init.d -mkdir -p %{buildroot}%{_fillupdir} -mkdir -p %{buildroot}%{_sbindir} -#---------------------------------------------------------------------- -# Install boot scripts: -install -m 755 %{_sourcedir}/rcfwnn %{buildroot}%{_initddir}/fwnn -install -m 755 %{_sourcedir}/rcfcwnn %{buildroot}%{_initddir}/fcwnn -install -m 755 %{_sourcedir}/rcftwnn %{buildroot}%{_initddir}/ftwnn -install -m 755 %{_sourcedir}/rcfkwnn %{buildroot}%{_initddir}/fkwnn -#---------------------------------------------------------------------- -# Make symbolic links -for i in fwnn fcwnn ftwnn fkwnn ; do - ( cd %{buildroot}%{_sbindir}; ln -s -f ../..%{_initddir}/$i rc$i ) -done +install -d %{buildroot}%{_unitdir} +install -m 644 %{SOURCE5} %{buildroot}%{_unitdir} +install -m 644 %{SOURCE6} %{buildroot}%{_unitdir} +install -m 644 %{SOURCE7} %{buildroot}%{_unitdir} +install -m 644 %{SOURCE8} %{buildroot}%{_unitdir} +install -d %{buildroot}%{_sbindir} +ln -s -f service %{buildroot}%{_sbindir}/rcfwnn +ln -s -f service %{buildroot}%{_sbindir}/rcfcwnn +ln -s -f service %{buildroot}%{_sbindir}/rcftwnn +ln -s -f service %{buildroot}%{_sbindir}/rcfkwnn ln -s -f %{_localstatedir}/lib/wnn/ja/dic %{buildroot}%{_sysconfdir}/FreeWnn/ja/dic ln -s -f %{_localstatedir}/lib/wnn/zh_CN/dic %{buildroot}%{_sysconfdir}/FreeWnn/zh_CN/dic ln -s -f %{_localstatedir}/lib/wnn/zh_TW/dic %{buildroot}%{_sysconfdir}/FreeWnn/zh_TW/dic @@ -297,21 +286,24 @@ %fdupes -s %{buildroot} %pre -n fwnn -%{_sbindir}/useradd -r -o -g root -u 66 -s /bin/false -c "Wnn System Account" -d %{_localstatedir}/lib/wnn wnn 2> /dev/null || : +%service_add_pre fwnn.service +getent passwd wnn >/dev/null || \ + %{_sbindir}/useradd -r -o -g root -u 66 -s /bin/false \ + -c "Wnn System Account" -d %{_localstatedir}/lib/wnn wnn %post -n fwnn +%service_add_post fwnn.service # 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/*.* -# Create symbolic runlevel links: -%{fillup_and_insserv -y} %preun -n fwnn +%service_del_preun fwnn.service %stop_on_removal fwnn %postun -n fwnn +%service_del_postun fwnn.service %restart_on_update fwnn -%insserv_cleanup %post -n libjd0 -p /sbin/ldconfig %postun -n libjd0 -p /sbin/ldconfig @@ -319,69 +311,85 @@ %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 || : +getent passwd wnn >/dev/null || \ + %{_sbindir}/useradd -r -o -g root -u 66 -s /bin/false \ + -c "Wnn System Account" -d %{_localstatedir}/lib/wnn wnn %pre -n fcwnncom -%{_sbindir}/useradd -r -o -g root -u 66 -s /bin/false -c "Wnn System Account" -d %{_localstatedir}/lib/wnn wnn 2> /dev/null || : +getent passwd wnn >/dev/null || \ + %{_sbindir}/useradd -r -o -g root -u 66 -s /bin/false \ + -c "Wnn System Account" -d %{_localstatedir}/lib/wnn wnn %pre -n fcwnn -%{_sbindir}/useradd -r -o -g root -u 66 -s /bin/false -c "Wnn System Account" -d %{_localstatedir}/lib/wnn wnn 2> /dev/null || : +%service_add_pre fcwnn.service +getent passwd wnn >/dev/null || \ + %{_sbindir}/useradd -r -o -g root -u 66 -s /bin/false \ + -c "Wnn System Account" -d %{_localstatedir}/lib/wnn wnn %preun -n fcwnn +%service_del_preun fcwnn.service %stop_on_removal fcwnn %post -n fcwnn +%service_add_post fcwnn.service # 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 +%service_del_postun fcwnn.service %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 || : +%service_add_pre ftwnn.service +getent passwd wnn >/dev/null || \ + %{_sbindir}/useradd -r -o -g root -u 66 -s /bin/false \ + -c "Wnn System Account" -d %{_localstatedir}/lib/wnn wnn %preun -n ftwnn +%service_del_preun ftwnn.service %stop_on_removal ftwnn %post -n ftwnn +%service_add_post ftwnn.service # touch all public dictionary files: chroot . usr/bin/cwnntouch var/lib/wnn/zh_TW/dic/sys/*.* # Create symbolic run level links: -%fillup_and_insserv %postun -n ftwnn +%service_del_postun ftwnn.service %restart_on_update ftwnn -%insserv_cleanup %pre -n fkwnn -%{_sbindir}/useradd -r -o -g root -u 66 -s /bin/false -c "Wnn System Account" -d %{_localstatedir}/lib/wnn wnn 2> /dev/null || : +%service_add_pre fkwnn.service +getent passwd wnn >/dev/null || \ + %{_sbindir}/useradd -r -o -g root -u 66 -s /bin/false \ + -c "Wnn System Account" -d %{_localstatedir}/lib/wnn wnn %preun -n fkwnn +%service_del_preun fkwnn.service %stop_on_removal fkwnn %post -n fkwnn +%service_add_post fkwnn.service # 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 +%service_del_postun fkwnn.service %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 %{_sbindir}/rcfwnn +%{_unitdir}/fwnn.service %{_bindir}/atod %{_bindir}/dtoa %{_bindir}/oldatonewa @@ -464,8 +472,8 @@ %files -n fcwnn %defattr(-,root,root) -%config %{_initddir}/fcwnn %{_sbindir}/rcfcwnn +%{_unitdir}/fcwnn.service %{_bindir}/cserver %config %{_sysconfdir}/FreeWnn/zh_CN/cixing.data %config %{_sysconfdir}/FreeWnn/zh_CN/cserverrc @@ -520,8 +528,8 @@ %files -n ftwnn %defattr(-,root,root) -%config %{_initddir}/ftwnn %{_sbindir}/rcftwnn +%{_unitdir}/ftwnn.service %{_bindir}/tserver %config %{_sysconfdir}/FreeWnn/zh_TW/cixing.data %{_sysconfdir}/FreeWnn/zh_TW/dic @@ -551,8 +559,8 @@ %files -n fkwnn %defattr(-,root,root) -%config %{_initddir}/fkwnn %{_sbindir}/rcfkwnn +%{_unitdir}/fkwnn.service %{_bindir}/kserver %{_bindir}/katod %{_bindir}/katof @@ -590,11 +598,11 @@ %{_includedir}/kwnn/ %{_libdir}/libkwnn.so # I don't know how to build xwnmo. Will try that later ... -# %files -n xwnmo -# %doc Xwnmo/manual Xwnmo/manual.en Xwnmo/README Xwnmo/README.j -# %doc Xwnmo/X11R6/README Xwnmo/X11R6/include/README -# %doc Xwnmo/xjutil/README Xwnmo/xjutil/README.j Xwnmo/xwnmo/README -# %doc Xwnmo/xwnmo/README.j Xwnmo/xwnmo/SEP_README Xwnmo/xwnmo/SEP_README.j +# %%files -n xwnmo +# %%doc Xwnmo/manual Xwnmo/manual.en Xwnmo/README Xwnmo/README.j +# %%doc Xwnmo/X11R6/README Xwnmo/X11R6/include/README +# %%doc Xwnmo/xjutil/README Xwnmo/xjutil/README.j Xwnmo/xwnmo/README +# %%doc Xwnmo/xwnmo/README.j Xwnmo/xwnmo/SEP_README Xwnmo/xwnmo/SEP_README.j # /usr/X11R6/lib/X11/app-defaults/Xwnmo # /usr/X11R6/bin/xwnmo # /usr/X11R6/bin/killxwnmo @@ -644,9 +652,9 @@ # /var/lib/wnn/ko_KR/uumkey.xim # /var/lib/wnn/ko_KR/xim.msg # /var/lib/wnn/ko_KR/xjutil.msg -# %config /var/lib/wnn/ximconf -# %config /var/lib/wnn/ximrc -# %config /var/lib/wnn/ximrc_vi -# %config /var/lib/wnn/cvt_xim_tbl +# %%config /var/lib/wnn/ximconf +# %%config /var/lib/wnn/ximrc +# %%config /var/lib/wnn/ximrc_vi +# %%config /var/lib/wnn/cvt_xim_tbl %changelog ++++++ _service ++++++ <services> <service name="obs_scm" mode="disabled"> <param name="url">:pserver:anonym...@cvs.osdn.net:/cvsroot/freewnn</param> <param name="scm">cvs</param> </service> <service name="tar" mode="disabled"/> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> <service name="set_version" mode="disabled" /> </services> ++++++ fcwnn.service ++++++ [Unit] ConditionPathExists=/etc/FreeWnn/zh_CN/cserverrc Description=Free Wnn (mainland) Chinese Server, for input of simplified Chinese [Service] Type=forking User=wnn ExecStartPre=/bin/rm -f /tmp/cd_sockV4 ExecStart=/usr/bin/cserver ExecStopPost=/bin/rm -f /tmp/cd_sockV4 [Install] WantedBy=multi-user.target ++++++ fkwnn.service ++++++ [Unit] ConditionPathExists=/etc/FreeWnn/ko_KR/kserverrc Description=Free Wnn Korean Server, for input of Korean [Service] Type=forking User=wnn ExecStartPre=/bin/rm -f /tmp/kd_sockV4 ExecStart=/usr/bin/kserver ExecStopPost=/bin/rm -f /tmp/kd_sockV4 [Install] WantedBy=multi-user.target ++++++ ftwnn.service ++++++ [Unit] ConditionPathExists=/etc/FreeWnn/zh_TW/tserverrc Description=Free Wnn Taiwan-Chinese Server, for input of traditional Chinese [Service] Type=forking User=wnn ExecStartPre=/bin/rm -f /tmp/td_sockV4 ExecStart=/usr/bin/tserver ExecStopPost=/bin/rm -f /tmp/td_sockV4 [Install] WantedBy=multi-user.target ++++++ fwnn.service ++++++ [Unit] ConditionPathExists=/etc/FreeWnn/ja/jserverrc Description=Free Wnn Kanji Server used for input of Japanese [Service] Type=forking User=wnn ExecStartPre=/bin/rm -f /tmp/jd_sockV4 ExecStart=/usr/bin/jserver ExecStopPost=/bin/rm -f /tmp/jd_sockV4 [Install] WantedBy=multi-user.target
