Hello community, here is the log from the commit of package festival for openSUSE:Factory checked in at 2020-09-04 11:10:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/festival (Old) and /work/SRC/openSUSE:Factory/.festival.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "festival" Fri Sep 4 11:10:38 2020 rev:39 rq:831981 version:2.5.0 Changes: -------- --- /work/SRC/openSUSE:Factory/festival/festival.changes 2020-08-31 16:50:33.852363554 +0200 +++ /work/SRC/openSUSE:Factory/.festival.new.3399/festival.changes 2020-09-04 11:11:22.607008564 +0200 @@ -1,0 +2,32 @@ +Fri Sep 4 04:57:39 UTC 2020 - Yasuhiko Kamata <[email protected]> + +- Removed "rcfestival" and added almost equivalent functionality + to systemd unit file (thanks to Franck Bui <[email protected]>). +- Removed %stop_on_removal and %restart_on_update from .spec, + which is not needed anymore. + +------------------------------------------------------------------- +Wed Sep 2 19:02:15 UTC 2020 - Franck Bui <[email protected]> + +- /var/run has been obsoleted by /run since a long time. + +------------------------------------------------------------------- +Wed Sep 2 18:45:18 UTC 2020 - Franck Bui <[email protected]> + +- Drop dependency on insserv-compat + + insserv-compat is going to be dropped soon or later on systems with + systemd as init system. + + It was only needed by /usr/lib/festival/server that uses rc_status + to pretty print the status of a command. + + Since this script is intended to be used by festival.service only + and not called directly by users and systemd has already its own + mechanism to report status, the use of rc_status doesn't seem to be + useful. + + Also there's no point in using %insserv_cleanup in %postun as this + package doesn't ship any sysv init script. + +------------------------------------------------------------------- Old: ---- rcfestival ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ festival.spec ++++++ --- /var/tmp/diff_new_pack.LftrLl/_old 2020-09-04 11:11:24.883009707 +0200 +++ /var/tmp/diff_new_pack.LftrLl/_new 2020-09-04 11:11:24.887009709 +0200 @@ -33,7 +33,6 @@ Source3: http://festvox.org/packed/%{name}/2.5/voices/festvox_kallpc16k.tar.gz Source4: http://festvox.org/packed/%{name}/2.5/festlex_POSLEX.tar.gz Source5: sysconfig.%{name} -Source6: rc%{name} Source7: http://festvox.org/packed/%{name}/2.5/voices/festvox_rablpc16k.tar.gz # systemd unit file Source8: %{name}.systemd @@ -59,7 +58,6 @@ BuildRequires: gcc-c++ BuildRequires: ncurses-devel BuildRequires: pkgconfig -Requires(pre): insserv-compat Requires(pre): %{_sbindir}/groupadd Requires(pre): %{_sbindir}/useradd @@ -167,8 +165,6 @@ # install libs install -Dm 644 ../%{name}/src/lib/libFestival.a %{buildroot}/%{_libdir}/libFestival.a install -m 644 lib/lib*.a %{buildroot}%{_libdir} -# install init script -install -m 755 -D %{SOURCE6} %{buildroot}%{_usr}/lib/%{name}/server install -d %{buildroot}%{_sbindir} ln -sf /sbin/service %{buildroot}%{_sbindir}/rc%{name} # install systemd unit file @@ -191,12 +187,9 @@ %service_add_post %{name}.service %preun -%stop_on_removal %{name} %service_del_preun %{name}.service %postun -%restart_on_update %{name} -%insserv_cleanup %service_del_postun %{name}.service %files @@ -212,9 +205,6 @@ %{_sbindir}/rc%{name} %{_unitdir}/%{name}.service %{_libexecdir}/%{name} -%if 0%{?suse_version} > 1500 -%{_prefix}/lib/%{name} -%endif %{_datadir}/%{name} %{_mandir}/man1/* %{_fillupdir}/* ++++++ festival.systemd ++++++ --- /var/tmp/diff_new_pack.LftrLl/_old 2020-09-04 11:11:24.951009741 +0200 +++ /var/tmp/diff_new_pack.LftrLl/_new 2020-09-04 11:11:24.951009741 +0200 @@ -5,17 +5,12 @@ Wants=remote-fs.target [Service] -Type=forking -Restart=no -TimeoutSec=5min -IgnoreSIGPIPE=no +Type=simple +EnvironmentFile=-/etc/sysconfig/festival KillMode=process -GuessMainPID=no -RemainAfterExit=yes -SuccessExitStatus=5 6 -ExecStart=/usr/lib/festival/server start -ExecStop=/usr/lib/festival/server stop -ExecReload=/usr/lib/festival/server reload +ExecStartPre=/bin/bash -c "[ \"$FESTIVAL_RUN_CHROOTED\" = yes ] && for configfile in /etc/festival.scm $FESTIVAL_CHROOT_FILES; do test -d $FESTIVAL_CHROOT_PREFIX/$${configfile%/*} || mkdir -p $FESTIVAL_CHROOT_PREFIX/$${configfile%/*}; cp -auL $${configfile} $FESTIVAL_CHROOT_PREFIX/$${configfile%/*}; done" +ExecStart=/bin/bash -c "exec /usr/bin/festival $FESTIVAL_OPTIONS --server $( [ \"$FESTIVAL_RUN_CHROOTED\" = yes ] && echo --libdir / --uid festival --chroot \"$FESTIVAL_CHROOT_PREFIX\" )" +ExecReload=/usr/bin/kill -HUP $MAINPID [Install] WantedBy=multi-user.target ++++++ sysconfig.festival ++++++ --- /var/tmp/diff_new_pack.LftrLl/_old 2020-09-04 11:11:24.995009763 +0200 +++ /var/tmp/diff_new_pack.LftrLl/_new 2020-09-04 11:11:24.999009766 +0200 @@ -12,9 +12,6 @@ # # Shall the festival server run in the chroot jail /var/lib/festival? # -# Each time you start festival with the init script, /etc/festival.conf will be -# copied to /var/lib/festival/etc/. -# FESTIVAL_RUN_CHROOTED="yes" ## Type: string @@ -22,6 +19,14 @@ ## ServiceRestart: ntp # # If the festival server runs in the chroot jail these files will be -# copied to /var/lib/festival/ besides the default of /etc/festival.scm +# copied to $FESTIVAL_CHROOT_PREFIX besides the default of /etc/festival.scm # FESTIVAL_CHROOT_FILES="" + +## Type: string +## Default: "/usr/share/festival" +# +# festival chroot directory. +# +FESTIVAL_CHROOT_PREFIX="/usr/share/festival" +
