- separated -tools with cvt and gtf; release 4

[packages/xorg-xserver-server.git] / xorg-xserver-server.spec

diff --git a/xorg-xserver-server.spec b/xorg-xserver-server.spec
index b0299fa398063b64ba348f80ce1c507e78c4c00f..4519344714fc0555007114e89aa8894b481c892c 100644 (file)
--- a/xorg-xserver-server.spec
+++ b/xorg-xserver-server.spec
@@ -13,7 +13,7 @@
 %bcond_with    xf86bigfont     # XF86BigFont extension
 %bcond_with    xselinux        # SELinux extension
 %bcond_without dmx             # DMX DDX (Xdmx server)
-%bcond_without wayland         # Wayland DDX (Xwayland server)
+%bcond_with    wayland         # Wayland DDX (Xwayland server) [newer version in xorg-xserver-Xwayland.spec]
 %bcond_without xnest           # Xnest DDX (Xnest server)
 %bcond_without xvfb            # Xvfb DDX (Xvfb server)
 %bcond_without xephyr          # kdrive Xephyr server
@@ -38,7 +38,7 @@ Summary:      X.org server
 Summary(pl.UTF-8):     Serwer X.org
 Name:          xorg-xserver-server
 Version:       1.20.11
-Release:       2
+Release:       4
 License:       MIT
 Group:         X11/Servers
 Source0:       https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-%{version}.tar.bz2
@@ -55,11 +55,12 @@ Patch4:             %{name}-builtin-SHA1.patch
 Patch6:                110_nvidia_slowdow_fix.patch
 Patch7:                platform_probe_crash.patch
 URL:           https://xorg.freedesktop.org/
-BuildRequires: Mesa-libGL-devel >= 7.8.1
-%{?with_dri2:BuildRequires:    Mesa-libGL-devel >= 9.2.0}
+BuildRequires: Mesa-dri-devel >= 7.8.1
+%{?with_dri2:BuildRequires:    Mesa-dri-devel >= 9.2.0}
 %{?with_glamor:BuildRequires:  Mesa-libgbm-devel >= 17.1.0}
+BuildRequires: OpenGL-devel >= 3.0
 # for glx headers
-BuildRequires: OpenGL-GLX-devel
+BuildRequires: OpenGL-GLX-devel >= 1.3
 %{?with_xselinux:BuildRequires:        audit-libs-devel}
 BuildRequires: autoconf >= 2.60
 BuildRequires: automake
@@ -84,6 +85,7 @@ BuildRequires:        pam-devel
 BuildRequires: perl-base
 BuildRequires: pixman-devel >= %{pixman_ver}
 BuildRequires: pkgconfig >= 1:0.19
+BuildRequires: pkgconfig(gl) >= 1.2
 %{?with_systemtap:BuildRequires:       systemtap-sdt-devel}
 BuildRequires: systemd-devel >= 1:209
 BuildRequires: udev-devel >= 1:143
@@ -169,6 +171,7 @@ Requires:   xorg-lib-libpciaccess >= 0.12.901
 Requires:      xorg-lib-libxshmfence >= 1.1
 # for protocol.txt
 Requires:      xorg-xserver-common = %{version}-%{release}
+Suggests:      %{name}-tools = %{version}-%{release}
 Suggests:      dbus-x11 >= 1.0
 %{?with_hal:Suggests:  hal}
 Suggests:      udev-acl >= 1:143
@@ -209,11 +212,26 @@ It requires proper driver for your display hardware.
 Serwer Xorg to podstawowy serwer X wyświetlający obraz na karcie
 graficznej. Do działania wymaga odpowiedniego sterownika.
 
+%package tools
+Summary:       Tools to calculate modelines for X.org server
+Summary(pl.UTF-8):     Narzędzia do liczenia opisów trybów graficznych (modeline) dla serwera X.org
+Group:         X11/Applications
+Conflicts:     xorg-xserver-server < 1.20.11-4
+
+%description tools
+Tools to calculate modelines for X.org server (using Coordinated Video
+Timing or Generalized Timing Formula).
+
+%description tools -l pl.UTF-8
+Narzędzia do liczenia opisów trybów graficznych (modeline) dla serwera
+X.org (przy użyciu algorytmów Coordinated Video Timing lub
+Generalizaed Timing Formula).
+
 %package devel
 Summary:       Header files for X.org server
 Summary(pl.UTF-8):     Pliki nagłówkowe dla serwera X.org
 Group:         X11/Development/Libraries
-Requires:      Mesa-libGL-devel >= 7.8.0
+Requires:      Mesa-dri-devel >= 7.8.0
 Requires:      libdrm-devel >= 2.4.89
 Requires:      pixman-devel >= %{pixman_ver}
 Requires:      xorg-lib-libXfont2-devel >= 2.0.0
@@ -262,8 +280,7 @@ Summary:    GLX extension library for X.org server
 Summary(pl.UTF-8):     Biblioteka rozszerzenia GLX dla serwera X.org
 Group:         X11/Servers
 Requires:      %{name} = %{version}-%{release}
-Requires:      Mesa-libGL >= 7.1.0
-%{?with_dri2:Requires: Mesa-libGL >= 9.2.0}
+Requires:      OpenGL >= 1.2
 # Mesa version glapi tables in glx/ dir come from
 Provides:      xorg-xserver-libglx(glapi) = 7.1.0
 Provides:      xorg-xserver-module(glx)
@@ -297,7 +314,7 @@ Xdmx - rozproszony, wielomonitorowy serwer X.
 Summary:       Xephyr - nested X server
 Summary(pl.UTF-8):     Xephyr - zagnieżdżony serwer X
 Group:         X11/Servers
-Requires:      Mesa-libGL >= 7.1.0
+Requires:      OpenGL >= 3.0
 %{?with_glamor:Requires:       libepoxy >= 1.5.4}
 Requires:      libxcb >= 1.9.3
 Requires:      pixman >= %{pixman_ver}
@@ -358,7 +375,7 @@ Xnest - це сервер X Window System, який працює у вікні X
 Summary:       Xvfb - virtual framebuffer X server
 Summary(pl.UTF-8):     Xvfb - serwer X z wirtualnym framebufferem
 Group:         X11/Servers
-Requires:      Mesa-libGL >= 7.1.0
+Requires:      OpenGL >= 1.2.1
 Requires:      mktemp
 Requires:      pixman >= %{pixman_ver}
 Requires:      util-linux
@@ -514,7 +531,7 @@ fi
        --enable-xnest%{!?with_xnest:=no} \
        %{?with_xselinux:--enable-xselinux} \
        %{!?with_xvfb:--disable-xvfb} \
-       %{?with_wayland:--enable-xwayland} \
+       --enable-xwayland%{!?with_wayland:=no} \
        %{?with_eglstream:--enable-xwayland-eglstream} \
        %{!?with_systemtap:--without-dtrace} \
        --without-fop \
@@ -605,8 +622,6 @@ fi
 %attr(755,root,root) %{_bindir}/X
 %attr(755,root,root) %{_bindir}/Xorg
 %attr(4755,root,root) %{_bindir}/Xwrapper
-%attr(755,root,root) %{_bindir}/cvt
-%attr(755,root,root) %{_bindir}/gtf
 %attr(755,root,root) %{_libdir}/xorg/Xorg
 %attr(4755,root,root) %{_libdir}/xorg/Xorg.wrap
 %dir %{_libdir}/xorg/modules
@@ -643,8 +658,6 @@ fi
 %verify(not md5 mtime size) %{_datadir}/X11/xorg.conf.d/10-quirks.conf
 %{_mandir}/man1/Xorg.1*
 %{_mandir}/man1/Xorg.wrap.1*
-%{_mandir}/man1/cvt.1*
-%{_mandir}/man1/gtf.1*
 %{_mandir}/man4/exa.4*
 %{_mandir}/man4/fbdevhw.4*
 %{_mandir}/man4/modesetting.4*
@@ -652,6 +665,13 @@ fi
 %{_mandir}/man5/xorg.conf.5*
 %{_mandir}/man5/xorg.conf.d.5*
 
+%files tools
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/cvt
+%attr(755,root,root) %{_bindir}/gtf
+%{_mandir}/man1/cvt.1*
+%{_mandir}/man1/gtf.1*
+
 %files devel
 %defattr(644,root,root,755)
 %doc doc/{Xinput,Xserver-spec}.html %{?with_systemtap:doc/dtrace/Xserver-DTrace.html}