diff --git a/glslang.spec b/glslang.spec index d7fcd2a561883fb2a0cf7b63cf324b6e4785f802..987b785aac1659f090ebe0c2600fbca39ae7defd 100644 --- a/glslang.spec +++ b/glslang.spec @@ -2,7 +2,7 @@ Name: glslang Version: 14.3.0 -Release: 1 +Release: 2 Summary: OpenGL and OpenGL ES shader front end and validator License: BSD-2-Clause AND BSD-3-Clause AND GPL-3.0-or-later AND Apache-2.0 @@ -10,10 +10,10 @@ URL: https://github.com/KhronosGroup/%{name} Source0: %{url}/archive/refs/tags/%{version}.tar.gz Patch0: 0001-pkg-config-compatibility.patch -BuildRequires: cmake3 +BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: ninja-build -BuildRequires: spirv-tools-devel +BuildRequires: pkgconfig(SPIRV-Tools) >= 2019.2.1 %description %{name} is the official reference compiler front end for the OpenGL @@ -36,10 +36,10 @@ find . -name '*.h' -or -name '*.cpp' -or -name '*.hpp'| xargs chmod a-x %build %cmake -DBUILD_SHARED_LIBS=OFF -%make_build +%cmake_build %install -%make_install +%cmake_install # we don't want them in here rm -rf %{buildroot}%{_includedir}/SPIRV @@ -47,7 +47,7 @@ rm -rf %{buildroot}%{_includedir}/SPIRV %ifnarch s390x ppc64 %check pushd Test -./runtests localResults ../StandAlone/glslangValidator ../StandAlone/spirv-remap +./runtests localResults ../%{__cmake_builddir}/StandAlone/glslangValidator ../%{__cmake_builddir}/StandAlone/spirv-remap popd %endif @@ -71,6 +71,9 @@ popd %{_libdir}/cmake/* %changelog +* Wed Jan 01 2025 Funda Wang - 14.3.0-2 +- adopt to new cmake macro + * Tue Sep 24 2024 liweigang - 14.3.0-1 - update to version 14.0.3