From 8125fb4431ef2af0d5e016b3f2010a79e532c5678d9ad1f5d1607e3be1bb23cb Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Tue, 8 Sep 2020 23:24:28 +0000
Subject: [PATCH] - simplified UsrEtcMove enable/disable logic in specfile

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xinit?expand=0&rev=57
---
 xinit.changes |  5 +++++
 xinit.spec    | 10 ++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/xinit.changes b/xinit.changes
index 250e7ca..8edf44c 100644
--- a/xinit.changes
+++ b/xinit.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Sep  8 23:09:02 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
+
+- simplified UsrEtcMove enable/disable logic in specfile 
+
 -------------------------------------------------------------------
 Tue Sep  8 11:36:36 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
 
diff --git a/xinit.spec b/xinit.spec
index 3a77bfd..38ef66c 100644
--- a/xinit.spec
+++ b/xinit.spec
@@ -16,7 +16,9 @@
 #
 
 
+%if 0%{?suse_version} >= 1550
 %define UsrEtcMove 1
+%endif
 
 Name:           xinit
 Version:        1.4.1
@@ -65,7 +67,7 @@ terminate.
 
 %prep
 %setup -q
-%if 0%{?suse_version} >= 1550 && 0%{UsrEtcMove}
+%if 0%{?UsrEtcMove}
 sed -i 's+/etc/X11+%{_libexecdir}+' %{PATCH0}
 %endif
 %patch0 -p0
@@ -79,7 +81,7 @@ sed -i 's+/etc/X11+%{_libexecdir}+' %{PATCH0}
 autoreconf -fi
 
 %build
-%if 0%{?suse_version} >= 1550 && 0%{UsrEtcMove}
+%if 0%{?UsrEtcMove}
 %configure --with-xinitdir=%{_libexecdir}/xinit
 %else
 %configure
@@ -93,7 +95,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 && 0%{UsrEtcMove}
+%if 0%{?UsrEtcMove}
 patch -p0 < %{PATCH5}
 mkdir -p %{buildroot}%{_libexecdir}/xinit
 mv etc/X11/xinit/{xinitrc,xserverrc} %{buildroot}%{_libexecdir}/xinit
@@ -107,7 +109,7 @@ popd
 %files
 %defattr(-,root,root)
 %doc ChangeLog COPYING README.md
-%if 0%{?suse_version} >= 1550 && 0%{UsrEtcMove}
+%if 0%{?UsrEtcMove}
 %dir %{_distconfdir}/X11
 %{_distconfdir}/X11/xinit/
 %{_distconfdir}/X11/Xresources