Hello community,
here is the log from the commit of package canna for openSUSE:Factory checked
in at 2015-01-03 22:01:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/canna (Old)
and /work/SRC/openSUSE:Factory/.canna.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "canna"
Changes:
--------
--- /work/SRC/openSUSE:Factory/canna/canna.changes 2014-11-11
09:59:58.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.canna.new/canna.changes 2015-01-03
22:01:30.000000000 +0100
@@ -1,0 +2,9 @@
+Fri Jan 2 11:12:46 UTC 2015 - ft...@geeko.jp
+
+- Fix boo#910933 Canna cannot start
+ + roll back the fix for bnc#878691
+ + use wnn user instead of canna
+ + fix the command line options in canna.service
+ + use /bin/rm instead of cannakill in canna.service
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ canna.spec ++++++
--- /var/tmp/diff_new_pack.mZhZ7u/_old 2015-01-03 22:01:32.000000000 +0100
+++ /var/tmp/diff_new_pack.mZhZ7u/_new 2015-01-03 22:01:32.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package canna
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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
@@ -205,8 +205,8 @@
install -m 755 $RPM_SOURCE_DIR/rccanna $RPM_BUILD_ROOT/etc/init.d/canna
ln -s ../../etc/init.d/canna $RPM_BUILD_ROOT/usr/sbin/rccanna
%else
-install -m 755 $RPM_SOURCE_DIR/canna.service
$RPM_BUILD_ROOT/%{_unitdir}/canna.service
-install -m 755 $RPM_SOURCE_DIR/canna-tmpfiles.conf
$RPM_BUILD_ROOT/usr/lib/tmpfiles.d/canna-tmpfiles.conf
+install -m 644 $RPM_SOURCE_DIR/canna.service
$RPM_BUILD_ROOT/%{_unitdir}/canna.service
+install -m 644 $RPM_SOURCE_DIR/canna-tmpfiles.conf
$RPM_BUILD_ROOT/usr/lib/tmpfiles.d/canna-tmpfiles.conf
%endif
install -m 644 $RPM_SOURCE_DIR/hosts.canna %{?buildroot}/etc/hosts.canna
# Remove all cannakill manpages because we've disabled it in
@@ -216,8 +216,6 @@
%pre -n canna
/usr/sbin/useradd -r -o -g bin -u 66 -s /bin/false -c "Wnn System Account" -d
/var/lib/wnn wnn 2> /dev/null || :
-/usr/sbin/groupadd -r canna || :
-/usr/sbin/useradd -r -g canna -d /usr/lib/canna -s /sbin/nologin -c 'Canna
Service User' canna ||:
%if %suse_version >= 1230
%service_add_post canna.service
%endif
++++++ canna-tmpfiles.conf ++++++
--- /var/tmp/diff_new_pack.mZhZ7u/_old 2015-01-03 22:01:32.000000000 +0100
+++ /var/tmp/diff_new_pack.mZhZ7u/_new 2015-01-03 22:01:32.000000000 +0100
@@ -1 +1 @@
-d /var/run/.iroha_unix 0755 canna canna -
+d /tmp/.iroha_unix 0755 root root -
++++++ canna.service ++++++
--- /var/tmp/diff_new_pack.mZhZ7u/_old 2015-01-03 22:01:32.000000000 +0100
+++ /var/tmp/diff_new_pack.mZhZ7u/_new 2015-01-03 22:01:32.000000000 +0100
@@ -2,10 +2,10 @@
Description=Canna Japanese Conversion Engine
[Service]
-User=canna
Type=forking
-ExecStart=/usr/sbin/cannaserver -syslog
-ExecStop=/usr/sbin/cannakill
+ExecPre=/bin/rm -rf /tmp/.iroha_unix
+ExecStart=/usr/sbin/cannaserver -s -u wnn -r /var/lib/canna
+ExecStopPost=/bin/rm -rf /tmp/.iroha_unix
[Install]
WantedBy=multi-user.target
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
