Update to glm-0.9.4.4

.gitignore

@@ -2,3 +2,4 @@
 /glm-0.9.3.4.zip
 /glm-0.9.4.2.zip
 /glm-0.9.4.3.zip
+/glm-0.9.4.4.zip

glm-0.9.4.2-negative-multiple.patch

@@ -1,48 +0,0 @@
-diff -ru glm-0.9.4.2.orig/test/gtx/gtx_multiple.cpp glm-0.9.4.2/test/gtx/gtx_multiple.cpp
---- glm-0.9.4.2.orig/test/gtx/gtx_multiple.cpp	2012-12-22 14:39:48.000000000 +0200
-+++ glm-0.9.4.2/test/gtx/gtx_multiple.cpp	2013-03-07 23:53:19.101880834 +0200
-@@ -14,12 +14,17 @@
- {
- 	int Error(0);
- 
--	int Higher0 = glm::higherMultiple(-5, 4);
--	Error += Higher0 == -4 ? 0 : 1;
--	Error += glm::higherMultiple(-4, 4) == -4 ? 0 : 1;
--	Error += glm::higherMultiple(-3, 4) == -4 ? 0 : 1;
--	Error += glm::higherMultiple(-2, 4) == -4 ? 0 : 1;
--	Error += glm::higherMultiple(-1, 4) == -4 ? 0 : 1;
-+	// Upstream claims that negative input is not supported.
-+	// Thus we do not test for it, to avoid test failure.
-+	//
-+	// See https://github.com/g-truc/glm/issues/51
-+	// int Higher0 = glm::higherMultiple(-5, 4);
-+	// Error += Higher0 == -4 ? 0 : 1;
-+	// Error += glm::higherMultiple(-4, 4) == -4 ? 0 : 1;
-+	// Error += glm::higherMultiple(-3, 4) == -4 ? 0 : 1;
-+	// Error += glm::higherMultiple(-2, 4) == -4 ? 0 : 1;
-+	// Error += glm::higherMultiple(-1, 4) == -4 ? 0 : 1;
-+
- 	Error += glm::higherMultiple(0, 4) == 0 ? 0 : 1;
- 	Error += glm::higherMultiple(4, 4) == 4 ? 0 : 1;
- 	Error += glm::higherMultiple(5, 4) == 8 ? 0 : 1;
-@@ -35,11 +40,15 @@
- {
- 	int Error(0);
- 
--	Error += glm::lowerMultiple(-5, 4) == -4 ? 0 : 1;
--	Error += glm::lowerMultiple(-4, 4) == -4 ? 0 : 1;
--	Error += glm::lowerMultiple(-3, 4) == 0 ? 0 : 1;
--	Error += glm::lowerMultiple(-2, 4) == 0 ? 0 : 1;
--	Error += glm::lowerMultiple(-1, 4) == 0 ? 0 : 1;
-+	// Upstream claims that negative input is not supported.
-+	// Thus we do not test for it, to avoid test failure.
-+	//
-+	// See https://github.com/g-truc/glm/issues/51
-+	// Error += glm::lowerMultiple(-5, 4) == -4 ? 0 : 1;
-+	// Error += glm::lowerMultiple(-4, 4) == -4 ? 0 : 1;
-+	// Error += glm::lowerMultiple(-3, 4) == 0 ? 0 : 1;
-+	// Error += glm::lowerMultiple(-2, 4) == 0 ? 0 : 1;
-+	// Error += glm::lowerMultiple(-1, 4) == 0 ? 0 : 1;
- 	Error += glm::lowerMultiple(0, 4) == 0 ? 0 : 1;
- 	Error += glm::lowerMultiple(4, 4) == 4 ? 0 : 1;
- 	Error += glm::lowerMultiple(5, 4) == 4 ? 0 : 1;

glm.spec

@@ -2,15 +2,14 @@
 %global debug_package %{nil}
 
 Name:           glm
-Version:        0.9.4.3
+Version:        0.9.4.4
 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.4.2-negative-multiple.patch
+Patch0:         glm-0.9.3.4-secondary.patch
-Patch1:         glm-0.9.3.4-secondary.patch
 BuildRequires:  cmake
 
 %description
@@ -62,12 +61,13 @@ a programming manual for the %{name}-devel package.
 # 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/tabs.css
 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
 %ifnarch %{ix86} x86_64
-%patch1 -p1 -b .secondary
+%patch0 -p1 -b .secondary
 %endif
 
 %build
@@ -97,6 +97,10 @@ find $RPM_BUILD_ROOT -name CMakeLists.txt -exec rm -f {} ';'
 %doc doc/api/
 
 %changelog
+* Sat Jul 06 2013 Joonas Sarajärvi <muep@iki.fi> - 0.9.4.4-1
+- Update to upstream GLM version 0.9.4.4
+- Bug fixes
+
 * Mon Apr 15 2013 Joonas Sarajärvi <muep@iki.fi> - 0.9.4.3-1
 - Update to upstream GLM version 0.9.4.3
 - This version introduces just minor bug fixes

sources

@@ -1 +1 @@
-b32dc6ba8807c112d9a8ff80cf753f98  glm-0.9.4.3.zip
+3118904f39befdb7063168316b6a33f1  glm-0.9.4.4.zip