From 0c423e75ddd9cfc6c7ee6d1526de98db30753a3ad09e0e96f51d00af3807081d Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Fri, 6 Mar 2020 10:30:17 +0000 Subject: [PATCH] - cleanup in specfile: get rid of is_opensuse macro, which is no longer needed at all (jira#PM-1623) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=933 --- Mesa-drivers.changes | 6 ++++++ Mesa-drivers.spec | 8 +------- Mesa.changes | 6 ++++++ Mesa.spec | 8 +------- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index 5d2aa35..c830265 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 6 10:27:21 UTC 2020 - Stefan Dirsch + +- cleanup in specfile: get rid of is_opensuse macro, which is no + longer needed at all (jira#PM-1623) + ------------------------------------------------------------------- Fri Feb 28 15:25:41 UTC 2020 - Stefan Dirsch diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index 5f5b9c6..53092bb 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -203,11 +203,9 @@ BuildRequires: libelf-devel %endif %endif # Requirements for wayland bumped up from 17.0 -%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse}) BuildRequires: pkgconfig(wayland-client) >= 1.11 BuildRequires: pkgconfig(wayland-protocols) >= 1.8 BuildRequires: pkgconfig(wayland-server) >= 1.11 -%endif %if 0%{with_llvm} %if 0%{?suse_version} >= 1550 BuildRequires: llvm-devel >= 9.0.0 @@ -217,7 +215,7 @@ BuildRequires: llvm9-devel %endif %if 0%{with_opencl} -%if 0%{?is_opensuse} +%if 0%{?suse_version} >= 1550 BuildRequires: clang-devel >= 9.0.0 %else BuildRequires: clang9-devel @@ -764,11 +762,7 @@ grep -v -i vulkan "%{_sourcedir}/baselibs.conf" >"%{_sourcedir}/temp" && \ %endif %build -%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse}) egl_platforms=x11,drm,surfaceless,wayland -%else -egl_platforms=x11,drm,surfaceless -%endif %meson \ --auto-features=disabled \ diff --git a/Mesa.changes b/Mesa.changes index 5d2aa35..c830265 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 6 10:27:21 UTC 2020 - Stefan Dirsch + +- cleanup in specfile: get rid of is_opensuse macro, which is no + longer needed at all (jira#PM-1623) + ------------------------------------------------------------------- Fri Feb 28 15:25:41 UTC 2020 - Stefan Dirsch diff --git a/Mesa.spec b/Mesa.spec index 391f86a..eb90850 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -202,11 +202,9 @@ BuildRequires: libelf-devel %endif %endif # Requirements for wayland bumped up from 17.0 -%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse}) BuildRequires: pkgconfig(wayland-client) >= 1.11 BuildRequires: pkgconfig(wayland-protocols) >= 1.8 BuildRequires: pkgconfig(wayland-server) >= 1.11 -%endif %if 0%{with_llvm} %if 0%{?suse_version} >= 1550 BuildRequires: llvm-devel >= 9.0.0 @@ -216,7 +214,7 @@ BuildRequires: llvm9-devel %endif %if 0%{with_opencl} -%if 0%{?is_opensuse} +%if 0%{?suse_version} >= 1550 BuildRequires: clang-devel >= 9.0.0 %else BuildRequires: clang9-devel @@ -763,11 +761,7 @@ grep -v -i vulkan "%{_sourcedir}/baselibs.conf" >"%{_sourcedir}/temp" && \ %endif %build -%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse}) egl_platforms=x11,drm,surfaceless,wayland -%else -egl_platforms=x11,drm,surfaceless -%endif %meson \ --auto-features=disabled \