From 518f686abfb76345e8ced0af445ce6f987072a10d9b75b6261bef0224e254ba8 Mon Sep 17 00:00:00 2001 From: Luciano Santos Date: Sun, 6 Aug 2023 01:03:45 +0000 Subject: [PATCH] Accepting request 1102084 from home:yfjiang:branches:GNOME:Factory - Support build environments like SLE 15 SP5 and Leap 15.5 which had %{_distconfdir) not defined yet. OBS-URL: https://build.opensuse.org/request/show/1102084 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/at-spi2-core?expand=0&rev=228 --- at-spi2-core.changes | 6 ++++++ at-spi2-core.spec | 14 +++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/at-spi2-core.changes b/at-spi2-core.changes index 05a4410..beb5528 100644 --- a/at-spi2-core.changes +++ b/at-spi2-core.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Aug 3 02:46:25 UTC 2023 - Yifan Jiang + +- Support build environments like SLE 15 SP5 and Leap 15.5 which + had %{_distconfdir) not defined yet. + ------------------------------------------------------------------- Sun May 28 09:12:49 UTC 2023 - Bjørn Lie diff --git a/at-spi2-core.spec b/at-spi2-core.spec index 7aa37ed..15ddd48 100644 --- a/at-spi2-core.spec +++ b/at-spi2-core.spec @@ -16,6 +16,8 @@ # +%define atspiconfdir %{?_distconfdir}%{!?_distconfdir:%{_sysconfdir}} + Name: at-spi2-core Version: 2.48.3 Release: 0 @@ -143,10 +145,12 @@ The package contains a ATK/D-Bus bridge library. %find_lang %{name} %fdupes %{buildroot}%{_datadir}/gtk-doc/html/ # Move autostart file to /usr/etc -mkdir -p %{buildroot}%{_distconfdir}/xdg/autostart -mkdir -p %{buildroot}%{_distconfdir}/xdg/Xwayland-session.d +mkdir -p %{buildroot}%{atspiconfdir}/xdg/autostart +mkdir -p %{buildroot}%{atspiconfdir}/xdg/Xwayland-session.d +%if 0%{defined _distconfdir} mv %{buildroot}%{_sysconfdir}/xdg/autostart/* %{buildroot}%{_distconfdir}/xdg/autostart/ mv %{buildroot}%{_sysconfdir}/xdg/Xwayland-session.d/* %{buildroot}%{_distconfdir}/xdg/Xwayland-session.d/ +%endif %ldconfig_scriptlets -n libatspi0 %ldconfig_scriptlets -n libatk-1_0-0 @@ -155,9 +159,9 @@ mv %{buildroot}%{_sysconfdir}/xdg/Xwayland-session.d/* %{buildroot}%{_distconfdi %files %license COPYING %{_libexecdir}/at-spi2/ -%dir %{_distconfdir}/xdg/Xwayland-session.d -%{_distconfdir}/xdg/Xwayland-session.d/00-at-spi -%{_distconfdir}/xdg/autostart/at-spi-dbus-bus.desktop +%dir %{atspiconfdir}/xdg/Xwayland-session.d +%{atspiconfdir}/xdg/Xwayland-session.d/00-at-spi +%{atspiconfdir}/xdg/autostart/at-spi-dbus-bus.desktop %{_userunitdir}/at-spi-dbus-bus.service %dir %{_datadir}/dbus-1/accessibility-services/ %{_datadir}/dbus-1/accessibility-services/org.a11y.atspi.Registry.service