pool/xinit
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- reverted move to /usr/etc/X11/xinit for now (boo#1175123, comment#6)

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xinit?expand=0&rev=55
This commit is contained in:
Stefan Dirsch 2020-09-08 09:48:23 +00:00 committed by Git OBS Bridge
parent 379530dc81
commit 7ac81f565f
2 changed files with 10 additions and 3 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 09:44:08 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
- reverted move to /usr/etc/X11/xinit for now (boo#1175123, comment#6)
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Sep 5 02:48:39 UTC 2020 - Stefan Dirsch <sndirsch@suse.com> Sat Sep 5 02:48:39 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>

8
xinit.spec
View File

@ -16,6 +16,8 @@
# #
%define UsrEtcMove 0
Name: xinit Name: xinit
Version: 1.4.1 Version: 1.4.1
Release: 0 Release: 0
@ -63,7 +65,7 @@ terminate.
%prep %prep
%setup -q %setup -q
%if 0%{?suse_version} >= 1550 %if 0%{?suse_version} >= 1550 && 0%{UsrEtcMove}
sed -i 's+/etc+/usr/etc+' %{PATCH0} sed -i 's+/etc+/usr/etc+' %{PATCH0}
%endif %endif
%patch0 -p0 %patch0 -p0
@ -87,7 +89,7 @@ install -m 0644 %{SOURCE3} %{buildroot}%{_mandir}/man1
install -m 0711 keygen %{buildroot}%{_bindir}/keygen install -m 0711 keygen %{buildroot}%{_bindir}/keygen
pushd %{buildroot} pushd %{buildroot}
tar xf %{SOURCE1} tar xf %{SOURCE1}
%if 0%{?suse_version} >= 1550 %if 0%{?suse_version} >= 1550 && 0%{UsrEtcMove}
patch -p0 < %{PATCH5} patch -p0 < %{PATCH5}
mkdir -p usr/etc/X11/xinit mkdir -p usr/etc/X11/xinit
mv etc/X11/Xresources usr/etc/X11 mv etc/X11/Xresources usr/etc/X11
@ -101,7 +103,7 @@ popd
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc ChangeLog COPYING README.md %doc ChangeLog COPYING README.md
%if 0%{?suse_version} >= 1550 %if 0%{?suse_version} >= 1550 && 0%{UsrEtcMove}
%dir %{_distconfdir}/X11 %dir %{_distconfdir}/X11
%{_distconfdir}/X11/xinit/ %{_distconfdir}/X11/xinit/
%{_distconfdir}/X11/Xresources %{_distconfdir}/X11/Xresources