From 5d28910a098e2462fcd89ed4776b3aabe72cfaa1 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Apr 14 2017 10:40:27 +0000 Subject: Fix epel build --- diff --git a/vulkan.spec b/vulkan.spec index 7c47046..b44d5b2 100644 --- a/vulkan.spec +++ b/vulkan.spec @@ -23,9 +23,9 @@ Name: vulkan Version: 1.0.46.0 %if 0%{?use_git} -Release: 0.1.git%{shortcommit}%{?dist} +Release: 0.2.git%{shortcommit}%{?dist} %else -Release: 1%{?dist} +Release: 2%{?dist} %endif Summary: Vulkan loader and validation layers @@ -114,6 +114,7 @@ chmod 0644 external/glslang/SPIRV/spirv.hpp %else mkdir -p build/ cp %{SOURCE4} . +sed -i -e 's@add_subdirectory(smoke)@@g' demos/CMakeLists.txt %endif # fix wrong-script-end-of-line-encoding sed -i 's/\r//' README.md @@ -164,9 +165,11 @@ popd %if 0%{?use_layers} mkdir -p %{buildroot}%{_datadir}/vulkan/{explicit,implicit}_layer.d/ mv %{buildroot}%{_sysconfdir}/vulkan/explicit_layer.d/*.json %{buildroot}%{_datadir}/vulkan/explicit_layer.d/ -%endif - install -T build/demos/smoketest %{buildroot}%{_bindir}/vulkan-smoketest +%else +mkdir -p %{buildroot}%{_sysconfdir}/vulkan/explicit_layer.d/ +mkdir -p %{buildroot}%{_datadir}/vulkan/{explicit,implicit}_layer.d/ +%endif # remove RPATH chrpath -d %{buildroot}%{_bindir}/vulkaninfo @@ -180,8 +183,8 @@ mkdir -p %{buildroot}%{_sysconfdir}/vulkan/icd.d %license LICENSE.txt COPYRIGHT.txt %doc README.md CONTRIBUTING.md %{_bindir}/vulkaninfo -%{_bindir}/vulkan-smoketest %if 0%{?use_layers} +%{_bindir}/vulkan-smoketest %{_datadir}/vulkan/explicit_layer.d/*.json %{_libdir}/libVkLayer_*.so %endif @@ -196,13 +199,14 @@ mkdir -p %{buildroot}%{_sysconfdir}/vulkan/icd.d %dir %{_sysconfdir}/vulkan %dir %{_sysconfdir}/vulkan/explicit_layer.d %dir %{_sysconfdir}/vulkan/icd.d -%if 0%{?use_layers} %dir %{_datadir}/vulkan %dir %{_datadir}/vulkan/explicit_layer.d %dir %{_datadir}/vulkan/implicit_layer.d -%endif %changelog +* Fri Apr 14 2017 Leigh Scott - 1.0.46.0-2 +- Fix epel build + * Fri Apr 14 2017 Leigh Scott - 1.0.46.0-1 - Update to 1.0.46.0 release