1
0

- fixed build on s390(x)

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=711
This commit is contained in:
Stefan Dirsch 2018-07-25 09:26:23 +00:00 committed by Git OBS Bridge
parent 30ecc4e4de
commit 5c9baa3e8e
2 changed files with 10 additions and 5 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Jul 25 09:25:28 UTC 2018 - sndirsch@suse.com
- fixed build on s390(x)
-------------------------------------------------------------------
Thu Jul 19 14:12:01 CEST 2018 - tiwai@suse.de

View File

@ -451,11 +451,6 @@ find %{buildroot}%{_libdir}/xorg/modules/ -name "*.la" | \
xargs rm
install -m 644 hw/xfree86/parser/{xf86Parser.h,xf86Optrec.h} \
%{buildroot}%{_includedir}/xorg
# FATE#325524
mkdir -p %{buildroot}%{_datadir}/factory/%{_localstatedir}/lib/xkb/compiled
mv %{buildroot}%{_localstatedir}/lib/xkb/compiled/README.compiled %{buildroot}%{_datadir}/factory/%{_localstatedir}/lib/xkb/compiled/
mkdir -p %{buildroot}%{_tmpfilesdir}
install -m 644 %{S:7} %{buildroot}%{_tmpfilesdir}/xkb.conf
# bnc #632737
chmod u-s %{buildroot}%{_bindir}/Xorg
%if 0%{?pci_ids_dir:1}
@ -478,6 +473,11 @@ install -m 644 $RPM_SOURCE_DIR/README.updates %{buildroot}%{_libdir}/xorg/module
%else
rm -f %{buildroot}%{_datadir}/aclocal/*.m4
%endif
# FATE#325524
mkdir -p %{buildroot}%{_datadir}/factory/%{_localstatedir}/lib/xkb/compiled
mv %{buildroot}%{_localstatedir}/lib/xkb/compiled/README.compiled %{buildroot}%{_datadir}/factory/%{_localstatedir}/lib/xkb/compiled/
mkdir -p %{buildroot}%{_tmpfilesdir}
install -m 644 %{S:7} %{buildroot}%{_tmpfilesdir}/xkb.conf
%ifarch s390 s390x
rm -f %{buildroot}%{_sysconfdir}/X11/10-quirks.conf
mkdir -p %{buildroot}%{_includedir}/xorg