Hello community, here is the log from the commit of package xfs for openSUSE:Factory checked in at 2020-07-28 17:25:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xfs (Old) and /work/SRC/openSUSE:Factory/.xfs.new.3592 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xfs" Tue Jul 28 17:25:11 2020 rev:17 rq:823018 version:1.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/xfs/xfs.changes 2020-01-06 15:21:50.452470097 +0100 +++ /work/SRC/openSUSE:Factory/.xfs.new.3592/xfs.changes 2020-07-28 17:25:38.105924936 +0200 @@ -1,0 +2,5 @@ +Mon Jul 27 15:30:53 UTC 2020 - Stefan Dirsch <[email protected]> + +- moved config file to /usr/etc/X11/fs (boo#1173050) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfs.spec ++++++ --- /var/tmp/diff_new_pack.ZhRS5N/_old 2020-07-28 17:25:39.737926788 +0200 +++ /var/tmp/diff_new_pack.ZhRS5N/_new 2020-07-28 17:25:39.741926792 +0200 @@ -1,7 +1,7 @@ # # spec file for package xfs # -# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,13 +16,17 @@ # +%if 0%{?suse_version} < 1550 + %define _distconfdir /usr/etc +%endif + Name: xfs Version: 1.2.0 Release: 0 Summary: X font server License: HPND Group: System/X11/Utilities -Url: http://xorg.freedesktop.org/ +URL: http://xorg.freedesktop.org/ # http://xorg.freedesktop.org/releases/individual/app/ Source0: %{name}-%{version}.tar.bz2 Source1: xfs.config @@ -48,14 +52,15 @@ %setup -q %build -%configure +%configure --with-default-config-file=%{_sysconfdir}/X11/fs/config,%{_distconfdir}/X11/fs/config make %{?_smp_mflags} %install %make_install mkdir -p %{buildroot}%{_sbindir} \ %{buildroot}%{_unitdir} -install -D -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/X11/fs/config +rm -f %{buildroot}%{_sysconfdir}/X11/fs/config +install -D -m 0644 %{SOURCE1} %{buildroot}%{_distconfdir}/X11/fs/config install -D -m 0444 %{SOURCE3} %{buildroot}%{_unitdir}/xfs.service install -D -m 0755 %{SOURCE2} %{buildroot}%{_sbindir}/rcxfs @@ -74,8 +79,10 @@ %files %defattr(-,root,root) %doc ChangeLog COPYING README -%dir %{_sysconfdir}/X11/fs -%config %verify(not md5 size mtime) %{_sysconfdir}/X11/fs/config +%dir %{_distconfdir} +%dir %{_distconfdir}/X11 +%dir %{_distconfdir}/X11/fs +%{_distconfdir}/X11/fs/config %{_unitdir}/xfs.service %{_sbindir}/rcxfs %{_bindir}/xfs ++++++ xfs.init.d ++++++ --- /var/tmp/diff_new_pack.ZhRS5N/_old 2020-07-28 17:25:39.781926838 +0200 +++ /var/tmp/diff_new_pack.ZhRS5N/_new 2020-07-28 17:25:39.781926838 +0200 @@ -24,9 +24,11 @@ rc_reset if [ ! -f /etc/X11/fs/config ] ; then - echo "can't find /etc/X11/fs/config" - # program is not configured - exit 6 + if [ ! -f /usr/etc/X11/fs/config ] ; then + echo "can't find neither /etc/X11/fs/config nor /usr/etc/X11/fs/config" + # program is not configured + exit 6 + fi fi case "$1" in
