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.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.canna.new/canna.changes 2013-10-29
09:36:59.000000000 +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.000000000 +0100
+++ /var/tmp/diff_new_pack.0dSTvx/_new 2013-10-29 09:37:00.000000000 +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
