Hello community, here is the log from the commit of package xsm for openSUSE:Factory checked in at 2020-07-05 01:14:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xsm (Old) and /work/SRC/openSUSE:Factory/.xsm.new.3060 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xsm" Sun Jul 5 01:14:51 2020 rev:8 rq:818560 version:1.0.4 Changes: -------- --- /work/SRC/openSUSE:Factory/xsm/xsm.changes 2018-04-19 15:27:11.884669578 +0200 +++ /work/SRC/openSUSE:Factory/.xsm.new.3060/xsm.changes 2020-07-05 01:15:59.532577864 +0200 @@ -1,0 +2,7 @@ +Thu Jul 2 15:10:51 UTC 2020 - Stefan Dirsch <[email protected]> + +- n_UsrEtc.patch: + * add /usr/etc/X11/xsm/system.xsm as fallback to + /etc/X11/xsm/system.xsm (boo#1173059) + +------------------------------------------------------------------- New: ---- n_UsrEtc.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xsm.spec ++++++ --- /var/tmp/diff_new_pack.6yad75/_old 2020-07-05 01:16:01.796585079 +0200 +++ /var/tmp/diff_new_pack.6yad75/_new 2020-07-05 01:16:01.804585105 +0200 @@ -1,7 +1,7 @@ # # spec file for package xsm # -# Copyright (c) 2018 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 @@ -12,18 +12,25 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # +%if 0%{?suse_version} < 1550 +%define _distconfdir /usr/etc +%endif + Name: xsm Version: 1.0.4 Release: 0 Summary: X Session Manager License: MIT Group: System/X11/Utilities -Url: http://xorg.freedesktop.org/ +URL: http://xorg.freedesktop.org/ Source0: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.bz2 +Patch0: n_UsrEtc.patch +BuildRequires: autoconf +BuildRequires: automake BuildRequires: pkg-config BuildRequires: pkgconfig(ice) BuildRequires: pkgconfig(sm) @@ -49,8 +56,10 @@ %prep %setup -q +%patch0 -p1 %build +autoreconf -fi %configure make %{?_smp_mflags} @@ -60,7 +69,9 @@ %files %defattr(-,root,root) %doc ChangeLog COPYING README -%config %{_sysconfdir}/X11/xsm/ +%dir %{_distconfdir} +%dir %{_distconfdir}/X11 +%{_distconfdir}/X11/xsm/ %{_bindir}/xsm %dir %{_datadir}/X11/app-defaults %{_datadir}/X11/app-defaults/XSm ++++++ n_UsrEtc.patch ++++++ diff -u -r -p xsm-1.0.4.orig/Makefile.am xsm-1.0.4/Makefile.am --- xsm-1.0.4.orig/Makefile.am 2018-03-10 05:25:22.000000000 +0100 +++ xsm-1.0.4/Makefile.am 2020-07-03 12:36:15.551617000 +0200 @@ -73,7 +73,7 @@ dist_appdefault_DATA = \ # system init file -systeminitdir = $(SYSTEM_INIT_DIR) +systeminitdir = /usr/etc/X11/xsm systeminit_DATA = system.xsm diff -u -r -p xsm-1.0.4.orig/restart.c xsm-1.0.4/restart.c --- xsm-1.0.4.orig/restart.c 2018-03-10 05:25:22.000000000 +0100 +++ xsm-1.0.4/restart.c 2020-07-03 12:26:18.281741000 +0200 @@ -538,9 +538,13 @@ StartDefaultApps (void) f = fopen (SYSTEM_INIT_FILE, "r"); if (!f) { - printf ("Could not find default apps file. Make sure you did\n"); - printf ("a 'make install' in the xsm build directory.\n"); - exit (1); + f = fopen ("/usr/etc/X11/xsm/system.xsm", "r"); + if (!f) + { + printf ("Could not find default apps file. Make sure you did\n"); + printf ("a 'make install' in the xsm build directory.\n"); + exit (1); + } } } fcntl(fileno(f), F_SETFD, FD_CLOEXEC);
