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

Accepting request 352831 from X11:XOrg

Browse Source 
- Add test for defined macro %build_xwayland
  This can be used to enable the build of Xwayland and the
  package xorg-x11-server-wayland using a macro in projconf
  (boo#960487).

- Split out Xwayland:
  * Build a package xorg-x11-server-wayland
  * Limit build to Factory (boo#960487).

OBS-URL: https://build.opensuse.org/request/show/352831
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=322
This commit is contained in:
Dominique Leuenberger 2016-01-12 15:11:59 +00:00 committed by Git OBS Bridge
commit d3cc331f4e
2 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
xorg-x11-server.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Sun Jan 10 18:59:29 UTC 2016 - eich@suse.com
- Add test for defined macro %build_xwayland
This can be used to enable the build of Xwayland and the
package xorg-x11-server-wayland using a macro in projconf
(boo#960487).
-------------------------------------------------------------------
Fri Jan 8 17:42:18 UTC 2016 - eich@suse.com
- Split out Xwayland:
* Build a package xorg-x11-server-wayland
* Limit build to Factory (boo#960487).
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Jan 2 18:47:27 UTC 2016 - hrvoje.senjan@gmail.com Sat Jan 2 18:47:27 UTC 2016 - hrvoje.senjan@gmail.com

24
xorg-x11-server.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package xorg-x11-server # spec file for package xorg-x11-server
# #
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -19,7 +19,7 @@
%ifarch s390 s390x %ifarch s390 s390x
%define have_wayland 0 %define have_wayland 0
%else %else
%if 0%{?suse_version} >= 1320 || 0%{?is_opensuse} %if 0%{?suse_version} >= 1330 || 0%{?build_xwayland}
%define have_wayland 1 %define have_wayland 1
%endif %endif
%endif %endif
@ -205,6 +205,18 @@ Obsoletes: xorg-x11-Xnest
%description extra %description extra
This package contains additional Xservers (Xdmx, Xephyr, Xnest). This package contains additional Xservers (Xdmx, Xephyr, Xnest).
%if 0%{?have_wayland} == 1
%package wayland
Summary: Xwayland Xserver
Group: System/X11/Servers/XF86_4
Requires: xkbcomp
Requires: xkeyboard-config
Requires: xorg-x11-fonts-core
%description wayland
This package contains the Xserver running on the Wayland Display Server.
%endif
%package sdk %package sdk
Summary: X Summary: X
Group: System/Libraries Group: System/Libraries
@ -475,12 +487,14 @@ fi
%ghost %{_sysconfdir}/alternatives/libglx.so %ghost %{_sysconfdir}/alternatives/libglx.so
%endif %endif
%endif %endif
%if 0%{?have_wayland} == 1
%{_bindir}/Xwayland
%endif
%{_bindir}/Xvfb %{_bindir}/Xvfb
%{_bindir}/xorg-backtrace %{_bindir}/xorg-backtrace
%if 0%{?have_wayland} == 1
%files wayland
%{_bindir}/Xwayland
%endif
%files extra %files extra
%defattr(-,root,root) %defattr(-,root,root)
%{_bindir}/Xephyr %{_bindir}/Xephyr