rpm/xorg-x11-server
SHA256
1
0
Fork 0
forked from pool/xorg-x11-server
Code Pull Requests Activity

Accepting request 625417 from X11:XOrg

Browse Source 
- fixed build on s390(x)

OBS-URL: https://build.opensuse.org/request/show/625417
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=360
This commit is contained in:
Dominique Leuenberger 2018-08-02 12:49:05 +00:00 committed by Git OBS Bridge
commit 56c34dd848
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
xorg-x11-server.changes
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

12
xorg-x11-server.spec
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
@ -564,13 +564,13 @@ fi
%dir %{pci_ids_dir}
%{pci_ids_dir}/modesetting.ids
%endif
%{_tmpfilesdir}/xkb.conf
%config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/10-quirks.conf
%config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/50-extensions.conf
%dir %{_datadir}/X11/xorg.conf.d
%{_datadir}/X11/xorg.conf.d/10-*.conf
%endif
%endif
%{_tmpfilesdir}/xkb.conf
%dir %{_localstatedir}/lib/xkb
%dir %{_localstatedir}/lib/xkb/compiled
%dir %{_libdir}/xorg