diff --git a/xinit.changes b/xinit.changes index 342f63a..5df1d89 100644 --- a/xinit.changes +++ b/xinit.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 8 09:44:08 UTC 2020 - Stefan Dirsch + +- reverted move to /usr/etc/X11/xinit for now (boo#1175123, comment#6) + ------------------------------------------------------------------- Sat Sep 5 02:48:39 UTC 2020 - Stefan Dirsch diff --git a/xinit.spec b/xinit.spec index dffc7c2..24f4d57 100644 --- a/xinit.spec +++ b/xinit.spec @@ -16,6 +16,8 @@ # +%define UsrEtcMove 0 + Name: xinit Version: 1.4.1 Release: 0 @@ -63,7 +65,7 @@ terminate. %prep %setup -q -%if 0%{?suse_version} >= 1550 +%if 0%{?suse_version} >= 1550 && 0%{UsrEtcMove} sed -i 's+/etc+/usr/etc+' %{PATCH0} %endif %patch0 -p0 @@ -87,7 +89,7 @@ install -m 0644 %{SOURCE3} %{buildroot}%{_mandir}/man1 install -m 0711 keygen %{buildroot}%{_bindir}/keygen pushd %{buildroot} tar xf %{SOURCE1} -%if 0%{?suse_version} >= 1550 +%if 0%{?suse_version} >= 1550 && 0%{UsrEtcMove} patch -p0 < %{PATCH5} mkdir -p usr/etc/X11/xinit mv etc/X11/Xresources usr/etc/X11 @@ -101,7 +103,7 @@ popd %files %defattr(-,root,root) %doc ChangeLog COPYING README.md -%if 0%{?suse_version} >= 1550 +%if 0%{?suse_version} >= 1550 && 0%{UsrEtcMove} %dir %{_distconfdir}/X11 %{_distconfdir}/X11/xinit/ %{_distconfdir}/X11/Xresources