From 1369b3b249af4e967f42b64e11810c7d71eb5b11 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sat, 13 Oct 2018 09:24:12 +0200 Subject: [PATCH 1/1] - updated to 0.9.9.2 - updated cmake patch --- GLM-cmake.patch | 20 +++++++++----------- GLM.spec | 6 +++--- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/GLM-cmake.patch b/GLM-cmake.patch index 5616637..34287bf 100644 --- a/GLM-cmake.patch +++ b/GLM-cmake.patch @@ -1,6 +1,6 @@ ---- glm/CMakeLists.txt.orig 2018-07-15 13:27:48.513071410 +0200 -+++ glm/CMakeLists.txt 2018-07-15 13:33:18.783067635 +0200 -@@ -176,7 +176,7 @@ +--- glm/CMakeLists.txt.orig 2018-10-13 08:46:37.872559133 +0200 ++++ glm/CMakeLists.txt 2018-10-13 09:11:42.575875287 +0200 +@@ -236,13 +236,13 @@ # install tree package config configure_package_config_file( cmake/glmConfig.cmake.in @@ -9,12 +9,10 @@ INSTALL_DESTINATION ${GLM_INSTALL_CONFIGDIR} PATH_VARS CMAKE_INSTALL_INCLUDEDIR NO_CHECK_REQUIRED_COMPONENTS_MACRO) -@@ -183,7 +183,7 @@ - if(GLM_INSTALL_ENABLE) - install(FILES -- "${CMAKE_CURRENT_BINARY_DIR}/${GLM_INSTALL_CONFIGDIR}/glmConfig.cmake" -+ "${CMAKE_CURRENT_BINARY_DIR}/glmConfig.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/glmConfigVersion.cmake" - DESTINATION ${GLM_INSTALL_CONFIGDIR}) - endif() + install(FILES +- "${CMAKE_CURRENT_BINARY_DIR}/${GLM_INSTALL_CONFIGDIR}/glmConfig.cmake" ++ "${CMAKE_CURRENT_BINARY_DIR}/glmConfig.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/glmConfigVersion.cmake" + DESTINATION ${GLM_INSTALL_CONFIGDIR}) + diff --git a/GLM.spec b/GLM.spec index 336bba7..ffb7ad1 100644 --- a/GLM.spec +++ b/GLM.spec @@ -6,17 +6,17 @@ Summary: OpenGL Mathematics (GLM) - C++ mathematics library for GLSL Summary(pl.UTF-8): OpenGL Mathematics (GLM) - biblioteka matematyczna C++ dla GLSL Name: GLM -Version: 0.9.9.0 +Version: 0.9.9.2 Release: 1 License: MIT Group: Development/Libraries #Source0Download: https://github.com/g-truc/glm/releases Source0: https://github.com/g-truc/glm/releases/download/%{version}/glm-%{version}.7z -# Source0-md5: a1b8a83ec4a35d3662e4be9a4b915127 +# Source0-md5: 191e3b9535081b06d2c01a2002c135ba Patch0: %{name}-opt.patch Patch1: %{name}-cmake.patch URL: https://glm.g-truc.net/ -BuildRequires: cmake +BuildRequires: cmake >= 3.2 %if %{with p7zip} BuildRequires: p7zip %else -- 2.44.0