From f33ae6ec4108636070e7909ebba640df3593fc5d Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Fri, 12 Nov 2021 13:06:09 +0100 Subject: [PATCH] drop C: xorg-xserver-server based on undefined var %xserver_ver was dropped 3 years ago in 1ea9613 --- Mesa.spec | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/Mesa.spec b/Mesa.spec index 54e2534..1da2e2f 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -619,7 +619,6 @@ Suggests: xorg-driver-video-ati Obsoletes: X11-driver-radeon-dri < 1:7.0.0 Conflicts: xorg-xserver-libglx(glapi) > %{glapi_ver} Conflicts: xorg-xserver-libglx(glapi) < %{glapi_ver} -Conflicts: xorg-xserver-server < %{xserver_ver} %description dri-driver-ati-radeon-R100 X.org DRI driver for ATI R100 card family (Radeon 7000-7500). It @@ -640,7 +639,6 @@ Suggests: xorg-driver-video-ati Obsoletes: X11-driver-radeon-dri < 1:7.0.0 Conflicts: xorg-xserver-libglx(glapi) > %{glapi_ver} Conflicts: xorg-xserver-libglx(glapi) < %{glapi_ver} -Conflicts: xorg-xserver-server < %{xserver_ver} %description dri-driver-ati-radeon-R200 X.org DRI driver for ATI R200 card family (Radeon 8500-92xx). It @@ -662,7 +660,6 @@ Suggests: xorg-driver-video-ati Obsoletes: X11-driver-radeon-dri < 1:7.0.0 Conflicts: xorg-xserver-libglx(glapi) > %{glapi_ver} Conflicts: xorg-xserver-libglx(glapi) < %{glapi_ver} -Conflicts: xorg-xserver-server < %{xserver_ver} %description dri-driver-ati-radeon-R300 X.org Gallium DRI driver for ATI R300/R400/RS690/R500 card family @@ -690,7 +687,6 @@ Suggests: xorg-driver-video-amdgpu Suggests: xorg-driver-video-ati Conflicts: xorg-xserver-libglx(glapi) > %{glapi_ver} Conflicts: xorg-xserver-libglx(glapi) < %{glapi_ver} -Conflicts: xorg-xserver-server < %{xserver_ver} %description dri-driver-ati-radeon-R600 X.org Gallium DRI driver for ATI R600/R700 card family (Radeon HD @@ -718,7 +714,6 @@ Suggests: xorg-driver-video-amdgpu Suggests: xorg-driver-video-ati Conflicts: xorg-xserver-libglx(glapi) > %{glapi_ver} Conflicts: xorg-xserver-libglx(glapi) < %{glapi_ver} -Conflicts: xorg-xserver-server < %{xserver_ver} %description dri-driver-ati-radeon-SI X.org Gallium DRI driver for ATI Southern Islands card family (Radeon @@ -742,7 +737,6 @@ Requires: zlib >= %{zlib_ver} #Suggests: xorg-driver-video-? Conflicts: xorg-xserver-libglx(glapi) > %{glapi_ver} Conflicts: xorg-xserver-libglx(glapi) < %{glapi_ver} -Conflicts: xorg-xserver-server < %{xserver_ver} %description dri-driver-etnaviv X.org Gallium DRI driver for Vivante 3D chips. @@ -760,7 +754,6 @@ Requires: zlib >= %{zlib_ver} Suggests: xorg-driver-video-freedreno Conflicts: xorg-xserver-libglx(glapi) > %{glapi_ver} Conflicts: xorg-xserver-libglx(glapi) < %{glapi_ver} -Conflicts: xorg-xserver-server < %{xserver_ver} %description dri-driver-freedreno X.org Gallium DRI driver for Adreno chips. @@ -777,7 +770,6 @@ Group: X11/Libraries Requires: zlib >= %{zlib_ver} Conflicts: xorg-xserver-libglx(glapi) > %{glapi_ver} Conflicts: xorg-xserver-libglx(glapi) < %{glapi_ver} -Conflicts: xorg-xserver-server < %{xserver_ver} %description dri-driver-intel-crocus X.org Gallium DRI driver for Intel Gen4/Gen5/Gen6/Gen7 chips. @@ -798,7 +790,6 @@ Obsoletes: Mesa-dri-driver-intel-i830 < 6.5 Obsoletes: X11-driver-i810-dri < 1:7.0.0 Conflicts: xorg-xserver-libglx(glapi) > %{glapi_ver} Conflicts: xorg-xserver-libglx(glapi) < %{glapi_ver} -Conflicts: xorg-xserver-server < %{xserver_ver} %description dri-driver-intel-i915 X.org DRI driver for Intel i915 card family (830, 845, 852/855, 865, @@ -818,7 +809,6 @@ Obsoletes: Mesa-dri-driver-intel-i830 < 6.5 Obsoletes: X11-driver-i810-dri < 1:7.0.0 Conflicts: xorg-xserver-libglx(glapi) > %{glapi_ver} Conflicts: xorg-xserver-libglx(glapi) < %{glapi_ver} -Conflicts: xorg-xserver-server < %{xserver_ver} %description dri-driver-intel-i965 X.org (non-Gallium) DRI driver for Intel i965 card family (946GZ, @@ -845,7 +835,6 @@ Group: X11/Libraries Requires: zlib >= %{zlib_ver} Conflicts: xorg-xserver-libglx(glapi) > %{glapi_ver} Conflicts: xorg-xserver-libglx(glapi) < %{glapi_ver} -Conflicts: xorg-xserver-server < %{xserver_ver} %description dri-driver-intel-iris X.org Gallium DRI driver for Intel Iris (Gen8+) card family @@ -867,7 +856,6 @@ Requires: zlib >= %{zlib_ver} #Suggests: xorg-driver-video-? Conflicts: xorg-xserver-libglx(glapi) > %{glapi_ver} Conflicts: xorg-xserver-libglx(glapi) < %{glapi_ver} -Conflicts: xorg-xserver-server < %{xserver_ver} %description dri-driver-kmsro X.org Gallium DRI driver using KMS Render-Only architecture. @@ -886,7 +874,6 @@ Requires: zlib >= %{zlib_ver} #Suggests: xorg-driver-video-??? Conflicts: xorg-xserver-libglx(glapi) > %{glapi_ver} Conflicts: xorg-xserver-libglx(glapi) < %{glapi_ver} -Conflicts: xorg-xserver-server < %{xserver_ver} %description dri-driver-lima X.org Gallium DRI driver for Mali Utgard chips. @@ -906,7 +893,6 @@ Requires: zlib >= %{zlib_ver} Suggests: xorg-driver-video-nouveau Conflicts: xorg-xserver-libglx(glapi) > %{glapi_ver} Conflicts: xorg-xserver-libglx(glapi) < %{glapi_ver} -Conflicts: xorg-xserver-server < %{xserver_ver} %description dri-driver-nouveau X.org DRI drivers for NVIDIA card family. @@ -924,7 +910,6 @@ Requires: zlib >= %{zlib_ver} #Suggests: xorg-driver-video-??? Conflicts: xorg-xserver-libglx(glapi) > %{glapi_ver} Conflicts: xorg-xserver-libglx(glapi) < %{glapi_ver} -Conflicts: xorg-xserver-server < %{xserver_ver} %description dri-driver-panfrost X.org Gallium DRI driver for Mali Midgard/Bifrost chips. @@ -941,7 +926,6 @@ Group: X11/Libraries Requires: zlib >= %{zlib_ver} Conflicts: xorg-xserver-libglx(glapi) > %{glapi_ver} Conflicts: xorg-xserver-libglx(glapi) < %{glapi_ver} -Conflicts: xorg-xserver-server < %{xserver_ver} %description dri-driver-swrast X.org DRI software rasterizer driver. @@ -959,7 +943,6 @@ Requires: zlib >= %{zlib_ver} #Suggests: xorg-driver-video-??? Conflicts: xorg-xserver-libglx(glapi) > %{glapi_ver} Conflicts: xorg-xserver-libglx(glapi) < %{glapi_ver} -Conflicts: xorg-xserver-server < %{xserver_ver} %description dri-driver-tegra X.org Gallium DRI driver for Tegra SoC chips. @@ -977,7 +960,6 @@ Requires: zlib >= %{zlib_ver} Suggests: xorg-driver-video-modesetting Conflicts: xorg-xserver-libglx(glapi) > %{glapi_ver} Conflicts: xorg-xserver-libglx(glapi) < %{glapi_ver} -Conflicts: xorg-xserver-server < %{xserver_ver} %description dri-driver-v3d X.org Gallium DRI driver for Broadcom VC5 chips. @@ -995,7 +977,6 @@ Requires: zlib >= %{zlib_ver} Suggests: xorg-driver-video-modesetting Conflicts: xorg-xserver-libglx(glapi) > %{glapi_ver} Conflicts: xorg-xserver-libglx(glapi) < %{glapi_ver} -Conflicts: xorg-xserver-server < %{xserver_ver} %description dri-driver-vc4 X.org Gallium DRI driver for Broadcom VC4 chips. @@ -1012,7 +993,6 @@ Group: X11/Libraries Requires: zlib >= %{zlib_ver} Conflicts: xorg-xserver-libglx(glapi) > %{glapi_ver} Conflicts: xorg-xserver-libglx(glapi) < %{glapi_ver} -Conflicts: xorg-xserver-server < %{xserver_ver} %description dri-driver-virgl X.org Gallium DRI driver for QEMU VirGL. @@ -1030,7 +1010,6 @@ Requires: zlib >= %{zlib_ver} Suggests: xorg-driver-video-vmware Conflicts: xorg-xserver-libglx(glapi) > %{glapi_ver} Conflicts: xorg-xserver-libglx(glapi) < %{glapi_ver} -Conflicts: xorg-xserver-server < %{xserver_ver} %description dri-driver-vmwgfx X.org Gallium DRI driver for VMWare. @@ -1046,7 +1025,6 @@ Group: X11/Libraries Requires: zlib >= %{zlib_ver} Conflicts: xorg-xserver-libglx(glapi) > %{glapi_ver} Conflicts: xorg-xserver-libglx(glapi) < %{glapi_ver} -Conflicts: xorg-xserver-server < %{xserver_ver} %description dri-driver-zink X.org Gallium DRI driver based on Vulkan. -- 2.44.0