Accepting request 689009 from home:mnhauke
- Fix typo in patch glm-cmake-config.patch - Correct License - Reenable disabled tests (fixed by upstream) * core_func_exponential * gtc_packing * gtc_integer * gtx_common OBS-URL: https://build.opensuse.org/request/show/689009 OBS-URL: https://build.opensuse.org/package/show/science/glm?expand=0&rev=5
This commit is contained in:
parent
72dce56f4e
commit
de1317a4a3
@ -8,7 +8,7 @@ index 10bb1af..7514d3a 100644
|
|||||||
cmake/glmConfig.cmake.in
|
cmake/glmConfig.cmake.in
|
||||||
- ${GLM_INSTALL_CONFIGDIR}/glmConfig.cmake
|
- ${GLM_INSTALL_CONFIGDIR}/glmConfig.cmake
|
||||||
- INSTALL_DESTINATION ${GLM_INSTALL_CONFIGDIR}
|
- INSTALL_DESTINATION ${GLM_INSTALL_CONFIGDIR}
|
||||||
+ CMAKE_CURRENT_BINARY_DIR}/glmConfig.cmake
|
+ ${CMAKE_CURRENT_BINARY_DIR}/glmConfig.cmake
|
||||||
+ INSTALL_DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
|
+ INSTALL_DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
|
||||||
PATH_VARS CMAKE_INSTALL_INCLUDEDIR
|
PATH_VARS CMAKE_INSTALL_INCLUDEDIR
|
||||||
NO_CHECK_REQUIRED_COMPONENTS_MACRO)
|
NO_CHECK_REQUIRED_COMPONENTS_MACRO)
|
||||||
|
15
glm.changes
15
glm.changes
@ -1,3 +1,18 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Mar 27 07:23:32 UTC 2019 - Martin Hauke <mardnh@gmx.de>
|
||||||
|
|
||||||
|
- Fix typo in patch glm-cmake-config.patch
|
||||||
|
- Correct License
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Mar 26 22:41:54 UTC 2019 - Martin Hauke <mardnh@gmx.de>
|
||||||
|
|
||||||
|
- Reenable disabled tests (fixed by upstream)
|
||||||
|
* core_func_exponential
|
||||||
|
* gtc_packing
|
||||||
|
* gtc_integer
|
||||||
|
* gtx_common
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Mar 25 13:59:02 UTC 2019 - Martin Hauke <mardnh@gmx.de>
|
Mon Mar 25 13:59:02 UTC 2019 - Martin Hauke <mardnh@gmx.de>
|
||||||
|
|
||||||
|
14
glm.spec
14
glm.spec
@ -20,7 +20,7 @@ Name: glm
|
|||||||
Version: 0.9.9.4
|
Version: 0.9.9.4
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Header only C++ mathematics library for graphics
|
Summary: Header only C++ mathematics library for graphics
|
||||||
License: MIT
|
License: MIT AND GPL-2.0-only
|
||||||
Group: Development/Libraries/C and C++
|
Group: Development/Libraries/C and C++
|
||||||
URL: https://glm.g-truc.net/
|
URL: https://glm.g-truc.net/
|
||||||
#Git-Clone: https://github.com/g-truc/glm.git
|
#Git-Clone: https://github.com/g-truc/glm.git
|
||||||
@ -64,18 +64,6 @@ This package provides the documentation for GLM library.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
%ifarch %{ix86}
|
|
||||||
sed -i '/glmCreateTestGTC(core_func_exponential)/d' test/core/CMakeLists.txt
|
|
||||||
# https://github.com/g-truc/glm/issues/212
|
|
||||||
sed -i '/glmCreateTestGTC(gtc_packing)/d' test/gtc/CMakeLists.txt
|
|
||||||
%if 0%{?suse_version} <= 1320
|
|
||||||
# https://github.com/g-truc/glm/issues/296
|
|
||||||
sed -i '/glmCreateTestGTC(gtc_integer)/d' test/gtc/CMakeLists.txt
|
|
||||||
%endif
|
|
||||||
%if 0%{?suse_version} <= 1320
|
|
||||||
sed -i '/glmCreateTestGTC(gtx_common)/d' test/gtx/CMakeLists.txt
|
|
||||||
%endif
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%cmake \
|
%cmake \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user