commit canna for openSUSE:Factory
Hello community,
here is the log from the commit of package canna for openSUSE:Factory checked
in at 2019-11-10 22:42:09
Comparing /work/SRC/openSUSE:Factory/canna (Old)
and /work/SRC/openSUSE:Factory/.canna.new.2990 (New)
Package is "canna"
Sun Nov 10 22:42:09 2019 rev:38 rq:746726 version:3.7p3
Changes:
--- /work/SRC/openSUSE:Factory/canna/canna.changes 2018-02-20
17:59:45.580345514 +0100
+++ /work/SRC/openSUSE:Factory/.canna.new.2990/canna.changes2019-11-10
22:42:09.233457779 +0100
@@ -1,0 +2,7 @@
+Sat Nov 9 03:07:27 UTC 2019 - Marguerite Su
+
+- ran spec-cleaner
+- do not install static archive into -devel package
+- put devel file lib*.so in -devel package
+
+---
Other differences:
--
++ canna.spec ++
--- /var/tmp/diff_new_pack.tJels1/_old 2019-11-10 22:42:10.209459046 +0100
+++ /var/tmp/diff_new_pack.tJels1/_new 2019-11-10 22:42:10.213459051 +0100
@@ -1,7 +1,7 @@
#
# spec file for package canna
#
-# Copyright (c) 2018 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
@@ -12,38 +12,20 @@
# 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/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: canna
-BuildRequires: automake
-BuildRequires: gcc
-BuildRequires: imake
-BuildRequires: ncurses-devel
-BuildRequires: pwdutils
-BuildRequires: termcap
-Requires(pre): /usr/sbin/useradd
-Requires(pre): /usr/sbin/groupadd
-Requires(pre): /bin/rm
-%if %suse_version < 1230
-Requires(pre): %insserv_prereq
-%else
-BuildRequires: pkgconfig(systemd)
-%{?systemd_requires}
-%endif
-#BuildPrereq: termcap
-Recommends: cannadic
Version:3.7p3
Release:0
-# http://canna.sourceforge.jp/
-Url:http://www.nec.co.jp/japanese/product/computer/soft/canna/
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary:Kana and Kanji Conversion System
-# select mirror from
-# http://sourceforge.jp/projects/canna/downloads/9565/Canna37p3.tar.bz2/
+# http://canna.sourceforge.jp/
License:BSD-3-Clause
Group: System/I18n/Japanese
+URL:http://www.nec.co.jp/japanese/product/computer/soft/canna/
+# select mirror from
+# http://sourceforge.jp/projects/canna/downloads/9565/Canna37p3.tar.bz2/
Source: Canna37p3.tar.bz2
Source1:candoc.tar.bz2
Source2:rccanna
@@ -73,6 +55,22 @@
Patch24:bug-262623-internet-usage-broken-by-security-patch.patch
Patch25:Canna37p3-destbufferoverflow.patch
Patch26:canna-fiximplicit.patch
+BuildRequires: automake
+BuildRequires: gcc
+BuildRequires: imake
+BuildRequires: ncurses-devel
+BuildRequires: pwdutils
+BuildRequires: termcap
+Requires(pre): %{_sbindir}/groupadd
+Requires(pre): %{_sbindir}/useradd
+Requires(pre): /bin/rm
+Recommends: cannadic
+%if 0%{?suse_version} < 1230
+Requires(pre): %insserv_prereq
+%else
+BuildRequires: pkgconfig(systemd)
+%{?systemd_requires}
+%endif
# Summary(ja): Canna - かな漢字変換システム
# %description -n canna -l ja
# UNIX 上で共通に使える日本語入力システムとして Wnn が存在しました。
@@ -105,33 +103,30 @@
environments, and on TTYs. Canna provides more than ten tools to
maintain Kana to Kanji conversion dictionaries.
-
%package -n canna-libs
-Summary:Canna Libraries
-Group: System/I18n/Japanese
-Provides: canna:/usr/lib/libcanna.so.1.1
+Summary:Canna Shared Libraries
+Group: System/Libraries
+Provides: canna:%{_prefix}/lib/libcanna.so.1.1
#Summary(ja): Canna ユーザインタフェースレベルのライブラリ
# %description -n canna-libs -l ja
# Canna ユーザインタフェースレベルのライブラリ
%description -n canna-libs
-Canna Libraries
-
+Canna Shared Libraries
%package -n canna-devel
-Summary:Libraries of Canna
+Summary:Canna Development Headers and Libraries
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}
Requires: %{name}-libs = %{version}
-Provides: cannadev
-Obsoletes: cannadev
+Provides: cannadev = %{version}-%{release}
+Obsoletes: cannadev < %{version}-%{release}
#Summary(ja): Canna ユーザインタフェースレベルのライブラリ
# %description -n canna-devel -l ja
# Canna ユーザインタフェースレベルのライブラリ
%description -n canna-devel
-Canna libraries.
-
+Canna development headers and libraries.
%prep
%setup -q -n Canna37p3 -a 1
@@ -146,8 +141,8 @@
%patch17 -p1 -b .sortcall
%patch18 -p1 -b
commit canna for openSUSE:Factory
Hello community, here is the log from the commit of package canna for openSUSE:Factory checked in at 2018-02-20 17:57:41 Comparing /work/SRC/openSUSE:Factory/canna (Old) and /work/SRC/openSUSE:Factory/.canna.new (New) Package is "canna" Tue Feb 20 17:57:41 2018 rev:37 rq:578387 version:3.7p3 Changes: --- /work/SRC/openSUSE:Factory/canna/canna.changes 2017-03-12 20:02:46.332181069 +0100 +++ /work/SRC/openSUSE:Factory/.canna.new/canna.changes 2018-02-20 17:59:45.580345514 +0100 @@ -1,0 +2,5 @@ +Mon Feb 19 20:09:03 UTC 2018 - crrodrig...@opensuse.org + +- BuildRequires imake not xorg-x11-devel + +--- Other differences: -- ++ canna.spec ++ --- /var/tmp/diff_new_pack.u2Vn51/_old 2018-02-20 17:59:46.960295848 +0100 +++ /var/tmp/diff_new_pack.u2Vn51/_new 2018-02-20 17:59:46.972295416 +0100 @@ -1,7 +1,7 @@ # # spec file for package canna # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -19,10 +19,10 @@ Name: canna BuildRequires: automake BuildRequires: gcc +BuildRequires: imake BuildRequires: ncurses-devel BuildRequires: pwdutils BuildRequires: termcap -BuildRequires: xorg-x11-devel Requires(pre): /usr/sbin/useradd Requires(pre): /usr/sbin/groupadd Requires(pre): /bin/rm
commit canna for openSUSE:Factory
Hello community,
here is the log from the commit of package canna for openSUSE:Factory checked
in at 2017-03-12 20:02:45
Comparing /work/SRC/openSUSE:Factory/canna (Old)
and /work/SRC/openSUSE:Factory/.canna.new (New)
Package is "canna"
Sun Mar 12 20:02:45 2017 rev:36 rq:477509 version:3.7p3
Changes:
--- /work/SRC/openSUSE:Factory/canna/canna.changes 2015-02-27
11:00:20.0 +0100
+++ /work/SRC/openSUSE:Factory/.canna.new/canna.changes 2017-03-12
20:02:46.332181069 +0100
@@ -1,0 +2,5 @@
+Tue Mar 7 12:36:44 UTC 2017 - i...@marguerite.su
+
+- Fix factory build, remove unrecognized RPM_SOURCE_DIR
+
+---
Other differences:
--
++ canna.spec ++
--- /var/tmp/diff_new_pack.ENvA7g/_old 2017-03-12 20:02:47.180061093 +0100
+++ /var/tmp/diff_new_pack.ENvA7g/_new 2017-03-12 20:02:47.180061093 +0100
@@ -1,7 +1,7 @@
#
# spec file for package canna
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -40,10 +40,10 @@
Url:http://www.nec.co.jp/japanese/product/computer/soft/canna/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary:Kana and Kanji Conversion System
-License:BSD-3-Clause
-Group: System/I18n/Japanese
# select mirror from
# http://sourceforge.jp/projects/canna/downloads/9565/Canna37p3.tar.bz2/
+License:BSD-3-Clause
+Group: System/I18n/Japanese
Source: Canna37p3.tar.bz2
Source1:candoc.tar.bz2
Source2:rccanna
@@ -134,7 +134,7 @@
%prep
-%setup -q -n Canna37p3
+%setup -q -n Canna37p3 -a 1
%patch0 -p1 -b .unoff1
%patch5 -p1 -b .security
%patch7 -p1 -b .Canna.conf
@@ -251,7 +251,7 @@
%files
%defattr(-,root,root,-)
-%doc CHANGES.jp README{,.jp} WHATIS{,.jp} ${RPM_SOURCE_DIR}/candoc.tar.bz2
+%doc CHANGES.jp README{,.jp} WHATIS{,.jp} candoc
%dir %attr(-,wnn,root) /var/log/canna
%dir %attr(-,wnn,root) /var/lib/canna/log
%dir %attr(-,wnn,root) /var/lib/wnn
commit canna for openSUSE:Factory
Hello community, here is the log from the commit of package canna for openSUSE:Factory checked in at 2015-02-27 10:59:42 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 2015-01-03 22:01:30.0 +0100 +++ /work/SRC/openSUSE:Factory/.canna.new/canna.changes 2015-02-27 11:00:20.0 +0100 @@ -1,0 +2,6 @@ +Thu Feb 19 13:50:43 UTC 2015 - ft...@geeko.jp + +- Fix the insufficient fix for boo#910933 + + fix /tmp/.iroha_unix is not removed at service start + +--- Other differences: -- ++ canna.service ++ --- /var/tmp/diff_new_pack.50NugG/_old 2015-02-27 11:00:21.0 +0100 +++ /var/tmp/diff_new_pack.50NugG/_new 2015-02-27 11:00:21.0 +0100 @@ -3,7 +3,7 @@ [Service] Type=forking -ExecPre=/bin/rm -rf /tmp/.iroha_unix +ExecStartPre=/bin/rm -rf /tmp/.iroha_unix ExecStart=/usr/sbin/cannaserver -s -u wnn -r /var/lib/canna ExecStopPost=/bin/rm -rf /tmp/.iroha_unix -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit canna for openSUSE:Factory
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.0 +0100
+++ /work/SRC/openSUSE:Factory/.canna.new/canna.changes 2015-01-03
22:01:30.0 +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.0 +0100
+++ /var/tmp/diff_new_pack.mZhZ7u/_new 2015-01-03 22:01:32.0 +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.0 +0100
+++ /var/tmp/diff_new_pack.mZhZ7u/_new 2015-01-03 22:01:32.0 +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.0 +0100
+++ /var/tmp/diff_new_pack.mZhZ7u/_new 2015-01-03 22:01:32.0 +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
commit canna for openSUSE:Factory
Hello community, here is the log from the commit of package canna for openSUSE:Factory checked in at 2014-11-11 09:59:40 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-05-27 11:52:05.0 +0200 +++ /work/SRC/openSUSE:Factory/.canna.new/canna.changes 2014-11-11 09:59:58.0 +0100 @@ -1,0 +2,10 @@ +Mon Nov 10 15:37:50 UTC 2014 - i...@marguerite.su + +- add baselibs.conf to Source99 + +--- +Sun Nov 09 02:28:00 UTC 2014 - Led led...@gmail.com + +- fix bashism in postun script + +--- Other differences: -- ++ canna.spec ++ --- /var/tmp/diff_new_pack.cH5rpw/_old 2014-11-11 09:59:59.0 +0100 +++ /var/tmp/diff_new_pack.cH5rpw/_new 2014-11-11 09:59:59.0 +0100 @@ -51,6 +51,7 @@ Source4:jisx6002.kpdef Source5:canna.service Source6:canna-tmpfiles.conf +Source99: baselibs.conf Patch0: unoff1.patch Patch5: security.patch Patch7: Canna.conf.patch @@ -242,7 +243,7 @@ %else %service_del_postun canna.service %endif -if [ $1 == 0 ]; then +if [ $1 = 0 ]; then rm -rf /tmp/.iroha_unix fi -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit canna for openSUSE:Factory
Hello community, here is the log from the commit of package canna for openSUSE:Factory checked in at 2014-05-27 11:52:04 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-05-15 19:10:24.0 +0200 +++ /work/SRC/openSUSE:Factory/.canna.new/canna.changes 2014-05-27 11:52:05.0 +0200 @@ -1,0 +2,5 @@ +Mon May 26 21:24:55 UTC 2014 - dval...@suse.com + +- add canna user for systemd-tmpfiles (bnc#878691) + +--- Other differences: -- ++ canna.spec ++ --- /var/tmp/diff_new_pack.K4NjMv/_old 2014-05-27 11:52:06.0 +0200 +++ /var/tmp/diff_new_pack.K4NjMv/_new 2014-05-27 11:52:06.0 +0200 @@ -24,6 +24,7 @@ BuildRequires: termcap BuildRequires: xorg-x11-devel Requires(pre): /usr/sbin/useradd +Requires(pre): /usr/sbin/groupadd Requires(pre): /bin/rm %if %suse_version 1230 Requires(pre): %insserv_prereq @@ -214,6 +215,8 @@ %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 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit canna for openSUSE:Factory
Hello community, here is the log from the commit of package canna for openSUSE:Factory checked in at 2014-05-15 19:10:22 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 2013-10-29 09:36:59.0 +0100 +++ /work/SRC/openSUSE:Factory/.canna.new/canna.changes 2014-05-15 19:10:24.0 +0200 @@ -1,0 +2,5 @@ +Wed May 14 16:08:28 UTC 2014 - meiss...@suse.com + +- add %service_add_pre to %pre section + +--- Other differences: -- ++ canna.spec ++ --- /var/tmp/diff_new_pack.iCMBNc/_old 2014-05-15 19:10:25.0 +0200 +++ /var/tmp/diff_new_pack.iCMBNc/_new 2014-05-15 19:10:25.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package canna # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -214,6 +214,9 @@ %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 || : +%if %suse_version = 1230 +%service_add_post canna.service +%endif %post -n canna %if %suse_version 1230 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit canna for openSUSE:Factory
Hello community,
here is the log from the commit of package canna for openSUSE:Factory checked
in at 2013-10-29 09:36:59
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 2013-07-18
17:30:55.0 +0200
+++ /work/SRC/openSUSE:Factory/.canna.new/canna.changes 2013-10-29
09:36:59.0 +0100
@@ -1,0 +2,9 @@
+Sat Oct 26 13:46:25 UTC 2013 - p.drou...@gmail.com
+
+- Improve systemd support for openSUSE = 12.3
+- Remove sysconfig and %fillup_prereq PreReq; package doesn't contain
+ any sysconfig file, these macros are useless
+- Don't provide INSTALL and INSTALL.jp in documentation; it describes
+ how do build from source have nothing to do in package
+
+---
New:
canna-tmpfiles.conf
canna.service
Other differences:
--
++ canna.spec ++
--- /var/tmp/diff_new_pack.0dSTvx/_old 2013-10-29 09:37:00.0 +0100
+++ /var/tmp/diff_new_pack.0dSTvx/_new 2013-10-29 09:37:00.0 +0100
@@ -23,8 +23,14 @@
BuildRequires: pwdutils
BuildRequires: termcap
BuildRequires: xorg-x11-devel
-PreReq: /usr/sbin/useradd /bin/rm %insserv_prereq %fillup_prereq
-PreReq: sysconfig
+Requires(pre): /usr/sbin/useradd
+Requires(pre): /bin/rm
+%if %suse_version 1230
+Requires(pre): %insserv_prereq
+%else
+BuildRequires: pkgconfig(systemd)
+%{?systemd_requires}
+%endif
#BuildPrereq: termcap
Recommends: cannadic
Version:3.7p3
@@ -42,6 +48,8 @@
Source2:rccanna
Source3:hosts.canna
Source4:jisx6002.kpdef
+Source5:canna.service
+Source6:canna-tmpfiles.conf
Patch0: unoff1.patch
Patch5: security.patch
Patch7: Canna.conf.patch
@@ -182,11 +190,22 @@
make install.man MANSUFFIX=1 LIBMANSUFFIX=3 DESTDIR=%{?buildroot}
chmod 755 $RPM_BUILD_ROOT/usr/bin/canuum
popd
+%if %suse_version 1230
mkdir -p $RPM_BUILD_ROOT/etc/init.d
mkdir -p $RPM_BUILD_ROOT/usr/sbin
+%else
+mkdir -p $RPM_BUILD_ROOT/%{_unitdir}
+mkdir -p $RPM_BUILD_ROOT/usr/lib/tmpfiles.d
+%endif
+mkdir -p $RPM_BUILD_ROOT/etc/hosts.canna
mkdir -p $RPM_BUILD_ROOT/var/lib/canna/log
+%if %suse_version 1230
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
+%endif
install -m 644 $RPM_SOURCE_DIR/hosts.canna %{?buildroot}/etc/hosts.canna
# Remove all cannakill manpages because we've disabled it in
# the server.
@@ -197,14 +216,26 @@
/usr/sbin/useradd -r -o -g bin -u 66 -s /bin/false -c Wnn System Account -d
/var/lib/wnn wnn 2 /dev/null || :
%post -n canna
+%if %suse_version 1230
%{fillup_and_insserv -y canna}
+%else
+%service_add_post canna.service
+%endif
%preun -n canna
+%if %suse_version 1230
%stop_on_removal canna
+%else
+%service_del_preun canna.service
+%endif
%postun -n canna
+%if %suse_version 1230
%restart_on_update canna
%insserv_cleanup
+%else
+%service_del_postun canna.service
+%endif
if [ $1 == 0 ]; then
rm -rf /tmp/.iroha_unix
fi
@@ -216,13 +247,17 @@
%files
%defattr(-,root,root,-)
%doc CHANGES.jp README{,.jp} WHATIS{,.jp} ${RPM_SOURCE_DIR}/candoc.tar.bz2
-%doc INSTALL{,.jp}
%dir %attr(-,wnn,root) /var/log/canna
%dir %attr(-,wnn,root) /var/lib/canna/log
%dir %attr(-,wnn,root) /var/lib/wnn
/etc/hosts.canna
+%if %suse_version 1230
/etc/init.d/canna
/usr/sbin/rccanna
+%else
+%{_unitdir}/canna.service
+%{_libexecdir}/tmpfiles.d/canna-tmpfiles.conf
+%endif
# don't package cannakill, it is disabled by okir's security patch anyway
# /usr/sbin/cannakill
# more secure permission for cannaserver
++ canna-tmpfiles.conf ++
d /var/run/.iroha_unix 0755 canna canna -
++ canna.service ++
[Unit]
Description=Canna Japanese Conversion Engine
[Service]
User=canna
Type=forking
ExecStart=/usr/sbin/cannaserver -syslog
ExecStop=/usr/sbin/cannakill
[Install]
WantedBy=multi-user.target
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit canna for openSUSE:Factory
Hello community, here is the log from the commit of package canna for openSUSE:Factory checked in at 2013-07-18 17:30:54 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 2013-07-09 20:46:38.0 +0200 +++ /work/SRC/openSUSE:Factory/.canna.new/canna.changes 2013-07-18 17:30:55.0 +0200 @@ -1,0 +2,7 @@ +Wed Jul 17 20:50:45 UTC 2013 - bkbin...@rinku.zaq.ne.jp + +- Remove obsoleted authors section . + Please see also + http://lists.opensuse.org/opensuse-ja/2013-07/msg00099.html + +--- Other differences: -- ++ canna.spec ++ --- /var/tmp/diff_new_pack.33MSAz/_old 2013-07-18 17:30:56.0 +0200 +++ /var/tmp/diff_new_pack.33MSAz/_new 2013-07-18 17:30:56.0 +0200 @@ -96,11 +96,6 @@ maintain Kana to Kanji conversion dictionaries. - -Authors: - -Osamu Hata h...@d1.bs2.mt.nec.co.jp - %package -n canna-libs Summary:Canna Libraries Group: System/I18n/Japanese @@ -113,11 +108,6 @@ Canna Libraries - -Authors: - -Osamu Hata h...@d1.bs2.mt.nec.co.jp - %package -n canna-devel Summary:Libraries of Canna Group: Development/Libraries/C and C++ @@ -133,11 +123,6 @@ Canna libraries. - -Authors: - -Osamu Hata h...@d1.bs2.mt.nec.co.jp - %prep %setup -q -n Canna37p3 %patch0 -p1 -b .unoff1 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit canna for openSUSE:Factory
Hello community, here is the log from the commit of package canna for openSUSE:Factory checked in at 2013-07-09 20:46:37 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 2012-06-06 10:30:48.0 +0200 +++ /work/SRC/openSUSE:Factory/.canna.new/canna.changes 2013-07-09 20:46:38.0 +0200 @@ -1,0 +2,7 @@ +Sun Jul 7 16:01:31 UTC 2013 - ft...@geeko.jp + +- remove locale(ja) and not installed by default because most users + do not use this package anymore +- fix source URL + +--- Other differences: -- ++ canna.spec ++ --- /var/tmp/diff_new_pack.ASsXid/_old 2013-07-09 20:46:38.0 +0200 +++ /var/tmp/diff_new_pack.ASsXid/_new 2013-07-09 20:46:38.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package canna # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -27,7 +27,6 @@ PreReq: sysconfig #BuildPrereq: termcap Recommends: cannadic -Provides: locale(ja) Version:3.7p3 Release:0 # http://canna.sourceforge.jp/ @@ -36,7 +35,9 @@ Summary:Kana and Kanji Conversion System License:BSD-3-Clause Group: System/I18n/Japanese -Source: http://downloads.sourceforge.jp/canna/9565/Canna37p3.tar.bz2 +# select mirror from +# http://sourceforge.jp/projects/canna/downloads/9565/Canna37p3.tar.bz2/ +Source: Canna37p3.tar.bz2 Source1:candoc.tar.bz2 Source2:rccanna Source3:hosts.canna -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit canna for openSUSE:Factory
Hello community, here is the log from the commit of package canna for openSUSE:Factory checked in at 2012-06-06 10:30:46 Comparing /work/SRC/openSUSE:Factory/canna (Old) and /work/SRC/openSUSE:Factory/.canna.new (New) Package is canna, Maintainer is lzw...@suse.com Changes: --- /work/SRC/openSUSE:Factory/canna/canna.changes 2012-05-31 17:02:52.0 +0200 +++ /work/SRC/openSUSE:Factory/.canna.new/canna.changes 2012-06-06 10:30:48.0 +0200 @@ -1,0 +2,5 @@ +Sat Jun 2 14:23:43 UTC 2012 - i...@marguerite.su + +- fix sles builds. + +--- Other differences: -- ++ canna.spec ++ --- /var/tmp/diff_new_pack.XlXsas/_old 2012-06-06 10:30:50.0 +0200 +++ /var/tmp/diff_new_pack.XlXsas/_new 2012-06-06 10:30:50.0 +0200 @@ -24,7 +24,7 @@ BuildRequires: termcap BuildRequires: xorg-x11-devel PreReq: /usr/sbin/useradd /bin/rm %insserv_prereq %fillup_prereq -PreReq: sysvinit(network) +PreReq: sysconfig #BuildPrereq: termcap Recommends: cannadic Provides: locale(ja) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit canna for openSUSE:Factory
Hello community, here is the log from the commit of package canna for openSUSE:Factory checked in at 2012-03-20 11:26:18 Comparing /work/SRC/openSUSE:Factory/canna (Old) and /work/SRC/openSUSE:Factory/.canna.new (New) Package is canna, Maintainer is lzw...@suse.com Changes: --- /work/SRC/openSUSE:Factory/canna/canna.changes 2011-12-25 17:33:25.0 +0100 +++ /work/SRC/openSUSE:Factory/.canna.new/canna.changes 2012-03-20 11:26:21.0 +0100 @@ -1,0 +2,6 @@ +Thu Mar 15 13:59:25 UTC 2012 - dval...@suse.com + +- copy config.guess, as the stock one is too old and not able to + guess ppc64 + +--- Other differences: -- ++ canna.spec ++ --- /var/tmp/diff_new_pack.FyHglp/_old 2012-03-20 11:26:23.0 +0100 +++ /var/tmp/diff_new_pack.FyHglp/_new 2012-03-20 11:26:23.0 +0100 @@ -20,6 +20,7 @@ BuildRequires: pwdutils BuildRequires: termcap BuildRequires: xorg-x11-devel +BuildRequires: automake PreReq: /usr/sbin/useradd /bin/rm %insserv_prereq %fillup_prereq PreReq: sysvinit(network) #BuildPrereq: termcap @@ -162,6 +163,7 @@ make Makefile make CDEBUGFLAGS=$RPM_OPT_FLAGS -fPIC -fno-strict-aliasing CXXDEBUGFLAGS=$RPM_OPT_FLAGS -fPIC -fno-strict-aliasing canna pushd canuum +cp /usr/share/automake-1.11/config.* . export CDEBUGFLAGS=$RPM_OPT_FLAGS -fno-strict-aliasing export CXXDEBUGFLAGS=$RPM_OPT_FLAGS -fno-strict-aliasing xmkmf -a -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit canna for openSUSE:Factory
Hello community,
here is the log from the commit of package canna for openSUSE:Factory checked
in at 2011-12-25 17:33:24
Comparing /work/SRC/openSUSE:Factory/canna (Old)
and /work/SRC/openSUSE:Factory/.canna.new (New)
Package is canna, Maintainer is lzw...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/canna/canna.changes 2011-09-23
01:53:11.0 +0200
+++ /work/SRC/openSUSE:Factory/.canna.new/canna.changes 2011-12-25
17:33:25.0 +0100
@@ -1,0 +2,5 @@
+Tue Dec 20 20:14:05 UTC 2011 - co...@suse.com
+
+- remove call to suse_update_config (very old work around)
+
+---
Other differences:
--
++ canna.spec ++
--- /var/tmp/diff_new_pack.RPYjww/_old 2011-12-25 17:33:26.0 +0100
+++ /var/tmp/diff_new_pack.RPYjww/_new 2011-12-25 17:33:26.0 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package canna (Version 3.7p3)
+# spec file for package canna
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 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
@@ -15,25 +15,24 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-
-
Name: canna
-BuildRequires: ncurses-devel pwdutils termcap xorg-x11-devel
-License:BSD-3-Clause
-Group: System/I18n/Japanese
+BuildRequires: ncurses-devel
+BuildRequires: pwdutils
+BuildRequires: termcap
+BuildRequires: xorg-x11-devel
PreReq: /usr/sbin/useradd /bin/rm %insserv_prereq %fillup_prereq
PreReq: sysvinit(network)
#BuildPrereq: termcap
Recommends: cannadic
-AutoReqProv:on
Provides: locale(ja)
Version:3.7p3
-Release:211
+Release:0
# http://canna.sourceforge.jp/
Url:http://www.nec.co.jp/japanese/product/computer/soft/canna/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary:Kana and Kanji Conversion System
+License:BSD-3-Clause
+Group: System/I18n/Japanese
Source: http://downloads.sourceforge.jp/canna/9565/Canna37p3.tar.bz2
Source1:candoc.tar.bz2
Source2:rccanna
@@ -99,7 +98,6 @@
Osamu Hata h...@d1.bs2.mt.nec.co.jp
%package -n canna-libs
-License:BSD-3-Clause
Summary:Canna Libraries
Group: System/I18n/Japanese
Provides: canna:/usr/lib/libcanna.so.1.1
@@ -117,7 +115,6 @@
Osamu Hata h...@d1.bs2.mt.nec.co.jp
%package -n canna-devel
-License:BSD-3-Clause
Summary:Libraries of Canna
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}, %{name}-libs = %{version}
@@ -161,7 +158,6 @@
%patch26 -p1
%build
-%{suse_update_config -f canuum}
xmkmf
make Makefile
make CDEBUGFLAGS=$RPM_OPT_FLAGS -fPIC -fno-strict-aliasing
CXXDEBUGFLAGS=$RPM_OPT_FLAGS -fPIC -fno-strict-aliasing canna
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit canna for openSUSE:Factory
Hello community,
here is the log from the commit of package canna for openSUSE:Factory checked
in at 2011-12-06 18:02:30
Comparing /work/SRC/openSUSE:Factory/canna (Old)
and /work/SRC/openSUSE:Factory/.canna.new (New)
Package is canna, Maintainer is lzw...@suse.com
Changes:
Other differences:
--
++ canna.spec ++
--- /var/tmp/diff_new_pack.4Bto0O/_old 2011-12-06 18:04:23.0 +0100
+++ /var/tmp/diff_new_pack.4Bto0O/_new 2011-12-06 18:04:23.0 +0100
@@ -20,7 +20,7 @@
Name: canna
BuildRequires: ncurses-devel pwdutils termcap xorg-x11-devel
-License:BSD3c(or similar)
+License:BSD-3-Clause
Group: System/I18n/Japanese
PreReq: /usr/sbin/useradd /bin/rm %insserv_prereq %fillup_prereq
PreReq: sysvinit(network)
@@ -99,7 +99,7 @@
Osamu Hata h...@d1.bs2.mt.nec.co.jp
%package -n canna-libs
-License:BSD3c(or similar)
+License:BSD-3-Clause
Summary:Canna Libraries
Group: System/I18n/Japanese
Provides: canna:/usr/lib/libcanna.so.1.1
@@ -117,7 +117,7 @@
Osamu Hata h...@d1.bs2.mt.nec.co.jp
%package -n canna-devel
-License:BSD3c(or similar)
+License:BSD-3-Clause
Summary:Libraries of Canna
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}, %{name}-libs = %{version}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
