Hello community, here is the log from the commit of package bzflag for openSUSE:Factory checked in at 2019-03-26 15:45:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bzflag (Old) and /work/SRC/openSUSE:Factory/.bzflag.new.25356 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bzflag" Tue Mar 26 15:45:04 2019 rev:30 rq:688334 version:2.4.12 Changes: -------- --- /work/SRC/openSUSE:Factory/bzflag/bzflag.changes 2018-01-13 21:40:30.358046857 +0100 +++ /work/SRC/openSUSE:Factory/.bzflag.new.25356/bzflag.changes 2019-03-26 15:45:12.728094273 +0100 @@ -1,0 +2,9 @@ +Tue Feb 26 15:02:29 UTC 2019 - josef.moell...@suse.com + +- Replaced the sysv init script by a systemd unit file + Due to the complexity of the init script, the script is still + used to start/stop the server. Note that the init script + and the systemd unit file are not part of upstream! + [bsc#1115940, bzflagserver.service] + +------------------------------------------------------------------- New: ---- bzflagserver.service ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bzflag.spec ++++++ --- /var/tmp/diff_new_pack.Tg1X2E/_old 2019-03-26 15:45:13.744093082 +0100 +++ /var/tmp/diff_new_pack.Tg1X2E/_new 2019-03-26 15:45:13.748093077 +0100 @@ -1,7 +1,7 @@ # # spec file for package bzflag # -# 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 @@ -28,13 +28,13 @@ License: GPL-2.0+ Group: Amusements/Games/3D/Shoot Url: http://bzflag.org/ -#Source: https://github.com/BZFlag-Dev/bzflag/archive/v%{version}.tar.gz#/bzflag-%{version}.tar.gz Source: https://download.bzflag.org/bzflag/source/%{version}/bzflag-%{version}.tar.gz Source2: rc.bzflagserver Source3: %{name}-maps.tar.bz2 Source4: sysconfig.bzflagserver-bzflag Source5: %{name}.desktop Source6: %{name}.png +Source7: bzflagserver.service # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch0: %{name}-1.10.4-ncursespollution.patch BuildRequires: bc @@ -56,7 +56,6 @@ BuildRequires: zlib-devel %endif Requires(pre): %fillup_prereq -Requires(pre): %insserv_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -71,6 +70,7 @@ %setup -q -a 3 %patch0 -p1 cp %{SOURCE2} . +cp %{SOURCE7} . %build %configure \ @@ -79,25 +79,28 @@ --disable-static make %{?_smp_mflags} all +%pre +%service_add_pre bzflagserver.service + %preun -%stop_on_removal bzflagserver +%service_del_preun bzflagserver.service %post %fillup_only -an bzflagserver +%service_add_post bzflagserver.service %postun -%restart_on_update bzflagserver -%insserv_cleanup +%service_del_postun bzflagserver.service %install #Init script for the BZFlag server -install -D -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/init.d/bzflagserver -mkdir -p %{buildroot}%{_sbindir} -ln -s %{_sysconfdir}/init.d/bzflagserver %{buildroot}%{_sbindir}/rcbzflagserver +mkdir -p %{buildroot}%{_datadir}/%{name}/scripts +install -D -m 755 %{SOURCE2} %{buildroot}%{_datadir}/%{name}/scripts/rcbzflagserver +install -D -m 644 %{SOURCE7} %{buildroot}%{_unitdir}/bzflagserver.service make MKDIR_P="mkdir -p --" DESTDIR=%{buildroot} install install -D -m 644 %{SOURCE4} %{buildroot}%{_fillupdir}/sysconfig.bzflagserver-bzflag -mkdir -p %{buildroot}%{_datadir}/bzflag/maps -install -m 644 maps/*bzmap %{buildroot}%{_datadir}/bzflag/maps +mkdir -p %{buildroot}%{_datadir}/%{name}/maps +install -m 644 maps/*bzmap %{buildroot}%{_datadir}/%{name}/maps install -D -m 644 %{SOURCE6} %{buildroot}%{_datadir}/pixmaps/bzflag.png %suse_update_desktop_file -i %{name} %fdupes %{buildroot} @@ -106,10 +109,11 @@ %defattr(-, root, root) %doc AUTHORS COPYING PORTING README DEVINFO %doc README.Linux misc/bzfs.conf ChangeLog -%{_sysconfdir}/init.d/bzflagserver -%{_sbindir}/rcbzflagserver -%{_bindir}/* %{_datadir}/%{name}/ +%{_datadir}/%{name}/scripts/ +%{_datadir}/bzflag/scripts/rcbzflagserver +%{_unitdir}/bzflagserver.service +%{_bindir}/* %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/%{name}.png %{_mandir}/man5/* ++++++ bzflagserver.service ++++++ # Automatically generated by systemd-sysv-generator [Unit] Documentation=http://bzflag.org/ SourcePath=/usr/share/bzflag/scripts/rcbzflagserver Description=LSB: bzflag server daemon After=remote-fs.target Wants=remote-fs.target Wants=syslog.socket [Service] Type=forking Restart=no TimeoutSec=5min IgnoreSIGPIPE=no KillMode=process GuessMainPID=no RemainAfterExit=yes SuccessExitStatus=5 6 ExecStart=/usr/share/bzflag/scripts/rcbzflagserver start ExecStop=/usr/share/bzflag/scripts/rcbzflagserver stop ExecReload=/usr/share/bzflag/scripts/rcbzflagserver reload [Install] WantedBy=multi-user.target ++++++ rc.bzflagserver ++++++ --- /var/tmp/diff_new_pack.Tg1X2E/_old 2019-03-26 15:45:13.816092998 +0100 +++ /var/tmp/diff_new_pack.Tg1X2E/_new 2019-03-26 15:45:13.816092998 +0100 @@ -62,12 +62,12 @@ if [ "$BZFLAGSERVER_SRVMSG" ] ; then startproc -u nobody -g nobody $BZFLAGSERVER_BIN \ $BZFLAGSERVER_OPTS $PUBLIC -p "$BZFLAGSERVER_PORT" \ - -world "/usr/share/games/bzflag/maps/$BZFLAGSERVER_WORLD" \ + -world "/usr/share/bzflag/maps/$BZFLAGSERVER_WORLD" \ -srvmsg "$BZFLAGSERVER_SRVMSG" $HANDICAP else startproc -u nobody -g nobody $BZFLAGSERVER_BIN \ $BZFLAGSERVER_OPTS $PUBLIC -p "$BZFLAGSERVER_PORT" \ - -world "/usr/share/games/bzflag/maps/$BZFLAGSERVER_WORLD" \ + -world "/usr/share/bzflag/maps/$BZFLAGSERVER_WORLD" \ $HANDICAP fi # Remember status and be verbose
