From 27a95d622126d8ccad52fca9298dbfea20028f7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joonas=20Saraj=C3=A4rvi?= Date: Tue, 20 Aug 2013 22:46:42 +0300 Subject: [PATCH] Tweak CRLF line ending related details --- glm-0.9.3.4-secondary.patch | 18 +++++++++--------- glm.spec | 16 ++++++++++------ 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/glm-0.9.3.4-secondary.patch b/glm-0.9.3.4-secondary.patch index 9646771..deaf4dd 100644 --- a/glm-0.9.3.4-secondary.patch +++ b/glm-0.9.3.4-secondary.patch @@ -2,12 +2,12 @@ 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) + + 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 2d48bf2..ad4af05 100644 --- a/glm.spec +++ b/glm.spec @@ -63,12 +63,16 @@ a programming manual for the %{name}-devel package. # A couple of files had CRLF line-ends in them. # Check with rpmlint after updating the package that we are not # forgetting to convert line endings in some files. -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 +# +# This release of glm seems to have shipped with no CRLF file +# endings at all, so these are commented out. +# 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