Hello community, here is the log from the commit of package xfs for openSUSE:Factory checked in at 2018-11-18 23:31:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xfs (Old) and /work/SRC/openSUSE:Factory/.xfs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xfs" Sun Nov 18 23:31:14 2018 rev:15 rq:649350 version:1.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/xfs/xfs.changes 2018-02-09 15:51:35.438675830 +0100 +++ /work/SRC/openSUSE:Factory/.xfs.new/xfs.changes 2018-11-18 23:31:28.845532621 +0100 @@ -1,0 +2,7 @@ +Thu Nov 15 11:40:11 UTC 2018 - [email protected] + +- switched from init.d script to a native systemd service + (boo#1116053) +- cleanup in specfile + +------------------------------------------------------------------- New: ---- xfs.service ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfs.spec ++++++ --- /var/tmp/diff_new_pack.iwvNJI/_old 2018-11-18 23:31:30.525530598 +0100 +++ /var/tmp/diff_new_pack.iwvNJI/_new 2018-11-18 23:31:30.525530598 +0100 @@ -19,7 +19,6 @@ Name: xfs Version: 1.2.0 Release: 0 -# FIXME: update xorg-x11-fonts-devel BuildRequires to font-util after renaming is done Summary: X font server License: HPND Group: System/X11/Utilities @@ -28,19 +27,15 @@ Source0: %{name}-%{version}.tar.bz2 Source1: xfs.config Source2: xfs.init.d -%if 0%{?suse_version} >= 01140 -# Needed to create the man page symlink to init.d -BuildRequires: aaa_base-extras -%endif +Source3: xfs.service +BuildRequires: font-util >= 1.1 BuildRequires: pkg-config -# FIXME: change to font-util >= 1.1 when xorg-x11-fonts-devel will be renamed -BuildRequires: xorg-x11-fonts-devel +BuildRequires: systemd-rpm-macros BuildRequires: pkgconfig(xfont2) BuildRequires: pkgconfig(xorg-macros) >= 1.10 BuildRequires: pkgconfig(xproto) >= 7.0.17 BuildRequires: pkgconfig(xtrans) PreReq: %fillup_prereq -PreReq: %insserv_prereq # This was part of the xorg-x11 package up to version 7.6 Conflicts: xorg-x11 <= 7.6 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -58,29 +53,32 @@ %install %make_install -install -D -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/X11/fs/config -install -D -m0755 %{SOURCE2} %{buildroot}%{_sysconfdir}/init.d/xfs -mkdir -p %{buildroot}%{_sbindir} -ln -s %{_sysconfdir}/init.d/xfs %{buildroot}%{_sbindir}/rcxfs +mkdir -p %{buildroot}%{_sbindir} \ + %{buildroot}%{_unitdir} +install -D -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/X11/fs/config +install -D -m 0444 %{SOURCE3} %{buildroot}%{_unitdir}/xfs.service +install -D -m 0755 %{SOURCE2} %{buildroot}%{_sbindir}/rcxfs + +%pre +%service_add_pre xfs.service %post -%fillup_and_insserv xfs +%service_add_post xfs.service %preun -%stop_on_removal xfs +%service_del_preun -f xfs.service %postun -%restart_on_update xfs -%insserv_cleanup +%service_del_postun -f xfs.service %files %defattr(-,root,root) %doc ChangeLog COPYING README %dir %{_sysconfdir}/X11/fs %config %verify(not md5 size mtime) %{_sysconfdir}/X11/fs/config -%{_sysconfdir}/init.d/xfs -%{_bindir}/xfs +%{_unitdir}/xfs.service %{_sbindir}/rcxfs +%{_bindir}/xfs %{_mandir}/man1/xfs.1%{?ext_man} %changelog ++++++ xfs.init.d ++++++ --- /var/tmp/diff_new_pack.iwvNJI/_old 2018-11-18 23:31:30.549530569 +0100 +++ /var/tmp/diff_new_pack.iwvNJI/_new 2018-11-18 23:31:30.549530569 +0100 @@ -3,7 +3,7 @@ # # Mike Fabian <[email protected]>, 2001 # -# /etc/init.d/xfs +# /usr/sbin/rcxfs # ### BEGIN INIT INFO # Provides: xfs ++++++ xfs.service ++++++ [Unit] Documentation=man:xfs(1) SourcePath=/usr/sbin/rcxfs Description=LSB: X Font Server After=network-online.target After=nss-lookup.target After=remote-fs.target Wants=network-online.target Wants=nss-lookup.target Wants=remote-fs.target [Service] Type=forking Restart=no TimeoutSec=5min IgnoreSIGPIPE=no KillMode=process GuessMainPID=no RemainAfterExit=yes SuccessExitStatus=5 6 ExecStart=/usr/sbin/rcxfs start ExecStop=/usr/sbin/rcxfs stop ExecReload=/usr/sbin/rcxfs reload
