diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index 2f8748f..1b35f9f 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -8,6 +8,9 @@ Thu Sep 26 14:03:05 UTC 2019 - Stefan Dirsch * Mesa-libGLESv2-devel since the header files for OpenGL, GLES, EGL, and GLX are now included by libglvnd-devel +- modified check for llvm version in a way so it works also with + older llvm packages (by making use of "llvm-config -version"), + where there is %{_llvm_sonum} macro defined yet ------------------------------------------------------------------- Wed Sep 25 18:34:34 UTC 2019 - Aaron Puchert diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index 9f5dda6..758599b 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -257,10 +257,6 @@ Summary: Libraries, includes and more to develop Mesa applications Group: Development/Libraries/X11 Requires: Mesa = %{version} Requires: Mesa-dri-devel = %{version} -#Requires: Mesa-libEGL-devel = %{version} -#Requires: Mesa-libGL-devel = %{version} -#Requires: Mesa-libGLESv1_CM-devel = %{version} -#Requires: Mesa-libGLESv2-devel = %{version} Requires: Mesa-libglapi-devel = %{version} Requires: libOSMesa-devel = %{version} Requires: libgbm-devel @@ -733,9 +729,9 @@ rm -rf docs/README.{VMS,WIN32,OS2} %patch0 -p1 %if 0%{with_llvm} -%if %{_llvm_sonum} >= 9 +if test $(llvm-config --version | cut -d "." -f1) -ge 9; then %patch1 -p1 -%endif +fi %endif %patch54 -p1 %patch58 -p1 diff --git a/Mesa.changes b/Mesa.changes index 2f8748f..1b35f9f 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -8,6 +8,9 @@ Thu Sep 26 14:03:05 UTC 2019 - Stefan Dirsch * Mesa-libGLESv2-devel since the header files for OpenGL, GLES, EGL, and GLX are now included by libglvnd-devel +- modified check for llvm version in a way so it works also with + older llvm packages (by making use of "llvm-config -version"), + where there is %{_llvm_sonum} macro defined yet ------------------------------------------------------------------- Wed Sep 25 18:34:34 UTC 2019 - Aaron Puchert diff --git a/Mesa.spec b/Mesa.spec index 76ca055..1931bdb 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -256,10 +256,6 @@ Summary: Libraries, includes and more to develop Mesa applications Group: Development/Libraries/X11 Requires: Mesa = %{version} Requires: Mesa-dri-devel = %{version} -#Requires: Mesa-libEGL-devel = %{version} -#Requires: Mesa-libGL-devel = %{version} -#Requires: Mesa-libGLESv1_CM-devel = %{version} -#Requires: Mesa-libGLESv2-devel = %{version} Requires: Mesa-libglapi-devel = %{version} Requires: libOSMesa-devel = %{version} Requires: libgbm-devel @@ -732,9 +728,9 @@ rm -rf docs/README.{VMS,WIN32,OS2} %patch0 -p1 %if 0%{with_llvm} -%if %{_llvm_sonum} >= 9 +if test $(llvm-config --version | cut -d "." -f1) -ge 9; then %patch1 -p1 -%endif +fi %endif %patch54 -p1 %patch58 -p1