- new Source URL, updated to 0.9.9.0

- updated opt patch
- added cmake patch (don't install file to root fs on build stage)
- cmake support changed FindGLM.cmake to glm subdir
- introduced glm.pc file

diff --git a/GLM-cmake.patch b/GLM-cmake.patch
new file mode 100644 (file)
index 0000000..5616637
--- /dev/null
+++ b/GLM-cmake.patch
@@ -0,0 +1,20 @@
+--- 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 @@
+ # install tree package config\r
+ configure_package_config_file(\r
+       cmake/glmConfig.cmake.in\r
+-      ${GLM_INSTALL_CONFIGDIR}/glmConfig.cmake\r
++      ${CMAKE_CURRENT_BINARY_DIR}/glmConfig.cmake\r
+       INSTALL_DESTINATION ${GLM_INSTALL_CONFIGDIR}\r
+       PATH_VARS CMAKE_INSTALL_INCLUDEDIR\r
+       NO_CHECK_REQUIRED_COMPONENTS_MACRO)\r
+@@ -183,7 +183,7 @@
+ \r
+ if(GLM_INSTALL_ENABLE)\r
+       install(FILES\r
+-              "${CMAKE_CURRENT_BINARY_DIR}/${GLM_INSTALL_CONFIGDIR}/glmConfig.cmake"\r
++              "${CMAKE_CURRENT_BINARY_DIR}/glmConfig.cmake"\r
+               "${CMAKE_CURRENT_BINARY_DIR}/glmConfigVersion.cmake"\r
+               DESTINATION ${GLM_INSTALL_CONFIGDIR})\r
+ endif()\r

diff --git a/GLM-opt.patch b/GLM-opt.patch
index 79eab429e231836ccd38ff0de0aeb8abbafec148..75d48a1d93368b92666ef0562aebd9c0e84069b8 100644 (file)
--- a/GLM-opt.patch
+++ b/GLM-opt.patch
@@ -1,11 +1,10 @@
---- glm/CMakeLists.txt.orig    2015-02-14 00:51:28.000000000 +0100
-+++ glm/CMakeLists.txt 2015-05-30 09:11:37.100401554 +0200
-@@ -129,8 +129,6 @@
- if(CMAKE_COMPILER_IS_GNUCXX)\r
-       #add_definitions(-S)\r
-       #add_definitions(-s)\r
--      add_definitions(-m64)\r
--      add_definitions(-O2)\r
+--- glm/CMakeLists.txt.orig    2018-05-07 14:23:01.000000000 +0200
++++ glm/CMakeLists.txt 2018-07-15 13:23:19.253074479 +0200
+@@ -143,7 +143,6 @@
+ elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU")\r
+       message("GLM: GCC - ${CMAKE_CXX_COMPILER_ID} compiler")\r
  \r
-       #add_definitions(-fprofile-arcs -ftest-coverage) gcov\r
-       #ctest_enable_coverage()\r
+-      add_compile_options(-O2)\r
+       add_compile_options(-Wno-long-long)\r
+ \r
+ elseif(CMAKE_CXX_COMPILER_ID MATCHES "Intel")\r

diff --git a/GLM.spec b/GLM.spec
index dc0605fbe65072efce4cda4cc033becba967568f..336bba72b5c380b86c8630982c881be1dc4223a2 100644 (file)
--- a/GLM.spec
+++ b/GLM.spec
@@ -6,14 +6,16 @@
 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.6.3
+Version:       0.9.9.0
 Release:       1
 License:       MIT
 Group:         Development/Libraries
-Source0:       http://downloads.sourceforge.net/ogl-math/glm-%{version}.7z
-# Source0-md5: 044224370047034c3d9340550e0ed52a
+#Source0Download: https://github.com/g-truc/glm/releases
+Source0:       https://github.com/g-truc/glm/releases/download/%{version}/glm-%{version}.7z
+# Source0-md5: a1b8a83ec4a35d3662e4be9a4b915127
 Patch0:                %{name}-opt.patch
-URL:           http://glm.g-truc.net/
+Patch1:                %{name}-cmake.patch
+URL:           https://glm.g-truc.net/
 BuildRequires: cmake
 %if %{with p7zip}
 BuildRequires: p7zip
@@ -42,6 +44,7 @@ graficznych opartych na specyfikacji OpenGL Shading Language (GLSL).
 %setup -q -n glm
 %endif
 %patch0 -p1
+%patch1 -p1
 
 %build
 mkdir build
@@ -62,6 +65,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc readme.txt doc/glm.pdf
+%doc manual.md readme.md
 %attr(755,root,root) %{_includedir}/glm
-%{_libdir}/cmake/FindGLM.cmake
+%{_pkgconfigdir}/glm.pc
+%{_libdir}/cmake/glm