diff --git a/.gitignore b/.gitignore index 8ec7e84..4a8d661 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /glm-0.9.4.6.zip /glm-0.9.5.2.zip /glm-0.9.6.1.zip +/glm-0.9.6.3.zip diff --git a/glm-0.9.6.3-nom64.patch b/glm-0.9.6.3-nom64.patch new file mode 100644 index 0000000..dcf245d --- /dev/null +++ b/glm-0.9.6.3-nom64.patch @@ -0,0 +1,12 @@ +diff -ru glm/CMakeLists.txt glm-nom64/CMakeLists.txt +--- glm/CMakeLists.txt 2015-02-14 00:51:30.000000000 +0200 ++++ glm-nom64/CMakeLists.txt 2015-04-25 10:14:57.585689646 +0300 +@@ -129,7 +129,7 @@ + if(CMAKE_COMPILER_IS_GNUCXX) + #add_definitions(-S) + #add_definitions(-s) +- add_definitions(-m64) ++ #add_definitions(-m64) + add_definitions(-O2) + + #add_definitions(-fprofile-arcs -ftest-coverage) gcov diff --git a/glm.spec b/glm.spec index 83637bd..aa23c49 100644 --- a/glm.spec +++ b/glm.spec @@ -2,8 +2,8 @@ %global debug_package %{nil} Name: glm -Version: 0.9.6.1 -Release: 3%{?dist} +Version: 0.9.6.3 +Release: 1%{?dist} Summary: C++ mathematics library for graphics programming License: MIT @@ -13,6 +13,7 @@ Patch0: glm-0.9.5.2-smallercount.patch Patch1: glm-0.9.6.1-ulp.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1185298 Patch2: glm-0.9.6.1-bigendian.patch +Patch3: glm-0.9.6.3-nom64.patch BuildRequires: cmake @@ -74,11 +75,15 @@ 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 + %patch0 -p1 -b .smallercount %patch1 -p1 -b .ulp %patch2 -p1 -b .bigendian +%patch3 -p1 -b .nom64 %build mkdir build @@ -116,6 +121,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/cmake/FindGLM.cmake %doc doc/api/ %changelog +* Sun Apr 26 2015 Joonas Sarajärvi - 0.9.6.3-1 +- Update to upstream GLM version 0.9.6.3 + * Mon Apr 20 2015 David Tardon - 0.9.6.1-3 - make -devel noarch - install license file in -doc, as required by packaging guidelines diff --git a/sources b/sources index 1e277a1..82ca78d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b1c5f1811d3fac4e3f4932bdab0cb7a6 glm-0.9.6.1.zip +acd0b517c37ed25c3f11ee155ee8257e glm-0.9.6.3.zip