rpm/xinit
SHA256
1
0
Fork 0
forked from pool/xinit
Code Pull Requests Activity

- simplified UsrEtcMove enable/disable logic in specfile

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xinit?expand=0&rev=57
This commit is contained in:
Stefan Dirsch 2020-09-08 23:24:28 +00:00 committed by Git OBS Bridge
parent 45db300bef
commit 8125fb4431
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
xinit.changes
View File

@ -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>

10
xinit.spec
View File

@ -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