[packages/GLM] - updated to 0.9.9.6 - run tests if they were built

bszx bszx at pld-linux.org
Sun Dec 1 11:19:24 CET 2019


commit aeef72e124d1027b647b1d51b6861ab70733bdba
Author: Bartek Szady <bszx at bszx.eu>
Date:   Sun Dec 1 11:17:46 2019 +0100

    - updated to 0.9.9.6
    - run tests if they were built

 GLM-cmake.patch | 18 ------------------
 GLM.spec        | 21 +++++++++------------
 revision.patch  | 11 -----------
 3 files changed, 9 insertions(+), 41 deletions(-)
---
diff --git a/GLM.spec b/GLM.spec
index a0f1199..84e32a6 100644
--- a/GLM.spec
+++ b/GLM.spec
@@ -6,16 +6,14 @@
 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.9.5
+Version:	0.9.9.6
 Release:	1
 License:	MIT
 Group:		Development/Libraries
 #Source0Download: https://github.com/g-truc/glm/releases
 Source0:	https://github.com/g-truc/glm/releases/download/%{version}/glm-%{version}.7z
-# Source0-md5:	8be5a872024077c6bcdde2a395817232
+# Source0-md5:	546245878ba4fc64f9af03c1c88b9ec9
 Patch0:		%{name}-opt.patch
-Patch1:		%{name}-cmake.patch
-Patch2:		revision.patch
 URL:		https://glm.g-truc.net/
 BuildRequires:	cmake >= 3.2
 %if %{with p7zip}
@@ -45,8 +43,6 @@ graficznych opartych na specyfikacji OpenGL Shading Language (GLSL).
 %setup -q -n glm
 %endif
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 mkdir build
@@ -54,13 +50,16 @@ cd build
 %cmake .. \
 	-DGLM_TEST_ENABLE:BOOL=%{!?with_tests:OFF}%{?with_tests:ON}
 
-%{?with_tests:%{__make}}
+%if %{with tests}
+%{__make}
+%{__make} test
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_includedir}
 
-%{__make} -C build install \
-	DESTDIR=$RPM_BUILD_ROOT
+cp -a glm $RPM_BUILD_ROOT%{_includedir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -68,6 +67,4 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc manual.md readme.md
-%attr(755,root,root) %{_includedir}/glm
-%{_pkgconfigdir}/glm.pc
-%{_libdir}/cmake/glm
+%{_includedir}/glm
diff --git a/GLM-cmake.patch b/GLM-cmake.patch
deleted file mode 100644
index 34287bf..0000000
--- a/GLM-cmake.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- glm/CMakeLists.txt.orig	2018-10-13 08:46:37.872559133 +0200
-+++ glm/CMakeLists.txt	2018-10-13 09:11:42.575875287 +0200
-@@ -236,13 +236,13 @@
- # install tree package config
- configure_package_config_file(
- 	cmake/glmConfig.cmake.in
--	${GLM_INSTALL_CONFIGDIR}/glmConfig.cmake
-+	${CMAKE_CURRENT_BINARY_DIR}/glmConfig.cmake
- 	INSTALL_DESTINATION ${GLM_INSTALL_CONFIGDIR}
- 	PATH_VARS CMAKE_INSTALL_INCLUDEDIR
- 	NO_CHECK_REQUIRED_COMPONENTS_MACRO)
- 
- install(FILES
--	"${CMAKE_CURRENT_BINARY_DIR}/${GLM_INSTALL_CONFIGDIR}/glmConfig.cmake"
-+	"${CMAKE_CURRENT_BINARY_DIR}/glmConfig.cmake"
- 	"${CMAKE_CURRENT_BINARY_DIR}/glmConfigVersion.cmake"
- 	DESTINATION ${GLM_INSTALL_CONFIGDIR})
- 
diff --git a/revision.patch b/revision.patch
deleted file mode 100644
index 51f83c2..0000000
--- a/revision.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- glm/glm/detail/setup.hpp.orig	2019-04-02 11:27:10.000000000 +0200
-+++ glm/glm/detail/setup.hpp	2019-08-03 14:14:01.942258319 +0200
-@@ -6,7 +6,7 @@
- #define GLM_VERSION_MAJOR			0
- #define GLM_VERSION_MINOR			9
- #define GLM_VERSION_PATCH			9
--#define GLM_VERSION_REVISION		4
-+#define GLM_VERSION_REVISION			5
- #define GLM_VERSION					995
- #define GLM_VERSION_MESSAGE			"GLM: version 0.9.9.5"
- 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/GLM.git/commitdiff/aeef72e124d1027b647b1d51b6861ab70733bdba



More information about the pld-cvs-commit mailing list