From 73ed3c74c2e45ed4600fd531f1e67b89d9ac6b96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joonas=20Saraj=C3=A4rvi?= Date: Sat, 29 Mar 2014 11:42:01 +0200 Subject: [PATCH] Update to glm-0.9.5.2 --- .gitignore | 1 + glm-0.9.3.4-secondary.patch | 13 ------------- glm.spec | 15 +++++---------- sources | 2 +- 4 files changed, 7 insertions(+), 24 deletions(-) delete mode 100644 glm-0.9.3.4-secondary.patch diff --git a/.gitignore b/.gitignore index 4118a45..315f31c 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /glm-0.9.4.4.zip /glm-0.9.4.5.zip /glm-0.9.4.6.zip +/glm-0.9.5.2.zip diff --git a/glm-0.9.3.4-secondary.patch b/glm-0.9.3.4-secondary.patch deleted file mode 100644 index deaf4dd..0000000 --- a/glm-0.9.3.4-secondary.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up glm-0.9.3.4/CMakeLists.txt.secondary glm-0.9.3.4/CMakeLists.txt ---- glm-0.9.3.4/CMakeLists.txt.secondary 2012-09-04 13:03:58.000000000 +0200 -+++ glm-0.9.3.4/CMakeLists.txt 2012-09-04 13:04:14.000000000 +0200 -@@ -53,9 +53,6 @@ elseif(NOT GLM_TEST_ENABLE_SIMD) - - add_definitions(-DGLM_FORCE_PURE) - -- if(CMAKE_COMPILER_IS_GNUCXX) -- add_definitions(-mfpmath=387) -- endif() - endif() - - option(GLM_TEST_ENABLE_FAST_MATH "Enable fast math optimizations" OFF) diff --git a/glm.spec b/glm.spec index 403b5e5..4d70aa2 100644 --- a/glm.spec +++ b/glm.spec @@ -2,14 +2,13 @@ %global debug_package %{nil} Name: glm -Version: 0.9.4.6 -Release: 2%{?dist} +Version: 0.9.5.2 +Release: 1%{?dist} Summary: C++ mathematics library for graphics programming License: MIT URL: http://glm.g-truc.net/ Source0: http://downloads.sourceforge.net/ogl-math/%{name}-%{version}/%{name}-%{version}.zip -Patch0: glm-0.9.3.4-secondary.patch BuildRequires: cmake %description @@ -69,14 +68,7 @@ a programming manual for the %{name}-devel package. sed -i 's/\r//' copying.txt sed -i 's/\r//' readme.txt sed -i 's/\r//' doc/api/doxygen.css -sed -i 's/\r//' doc/api/dynsections.js -sed -i 's/\r//' doc/api/jquery.js sed -i 's/\r//' doc/api/tabs.css -sed -i 's/\r//' CMakeLists.txt - -%ifnarch %{ix86} x86_64 -%patch0 -p1 -b .secondary -%endif %build mkdir build @@ -105,6 +97,9 @@ find $RPM_BUILD_ROOT -name CMakeLists.txt -exec rm -f {} ';' %doc doc/api/ %changelog +* Sat Mar 29 2014 Joonas Sarajärvi - 0.9.5.2-1 +- Update to upstream GLM version 0.9.5.2 + * Tue Sep 24 2013 Joonas Sarajärvi - 0.9.4.6-2 - Fix building on ARM diff --git a/sources b/sources index 5aa4f69..24de7c4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a6867c2f27da0635b80b54efa8617504 glm-0.9.4.6.zip +dd8332ef13c325e1e785130a92c168bd glm-0.9.5.2.zip