Accepting request 688281 from science

- Upstream does not package a dedicated LICENSE file.
  Make a note the license terms are included in manual.md
- Use %fdupes macro also for docs/api/
- Update to version 0.9.9.4
  See https://github.com/g-truc/glm/releases for the changelog
- Update patch:
  * glm-cmake-config.patch
- Run spec-cleaner

OBS-URL: https://build.opensuse.org/request/show/688281
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glm?expand=0&rev=9
This commit is contained in:
Dominique Leuenberger 2019-03-27 15:13:56 +00:00 committed by Git OBS Bridge
parent 219d436d98
commit 72dce56f4e
5 changed files with 54 additions and 46 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f39a908c6519e70ea1e91a8732e69aed84d28c46bc01cc3dedf71ca88b06716f
size 4347932

3
glm-0.9.9.4.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3a073eb8f3be07cee74481db0e1f78eda553b554941e405c863ab64de6a2e954
size 4578404

View File

@ -1,23 +1,20 @@
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -168,15 +168,15 @@ configure_file(
# install tree package config
configure_package_config_file(
cmake/glmConfig.cmake.in
- ${GLM_INSTALL_CONFIGDIR}/glmConfig.cmake
- INSTALL_DESTINATION ${GLM_INSTALL_CONFIGDIR}
+ ${CMAKE_CURRENT_BINARY_DIR}/glmConfig.cmake
+ INSTALL_DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
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}/glmVersion.cmake"
DESTINATION ${GLM_INSTALL_CONFIGDIR}
)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 10bb1af..7514d3a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -253,13 +253,12 @@ configure_file(cmake/glmBuildConfig.cmake.in glmConfig.cmake @ONLY)
# install tree package config
configure_package_config_file(
cmake/glmConfig.cmake.in
- ${GLM_INSTALL_CONFIGDIR}/glmConfig.cmake
- INSTALL_DESTINATION ${GLM_INSTALL_CONFIGDIR}
+ CMAKE_CURRENT_BINARY_DIR}/glmConfig.cmake
+ INSTALL_DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
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}/glmConfigVersion.cmake"
DESTINATION ${GLM_INSTALL_CONFIGDIR})

View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Mon Mar 25 13:59:02 UTC 2019 - Martin Hauke <mardnh@gmx.de>
- Upstream does not package a dedicated LICENSE file.
Make a note the license terms are included in manual.md
- Use %fdupes macro also for docs/api/
-------------------------------------------------------------------
Tue Mar 19 19:52:46 UTC 2019 - Martin Hauke <mardnh@gmx.de>
- Update to version 0.9.9.4
See https://github.com/g-truc/glm/releases for the changelog
- Update patch:
* glm-cmake-config.patch
- Run spec-cleaner
-------------------------------------------------------------------
Wed Jun 29 08:39:39 UTC 2016 - mpluskal@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package glm
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -12,25 +12,25 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: glm
Version: 0.9.7.5
Version: 0.9.9.4
Release: 0
Summary: Header only C++ mathematics library for graphics
License: MIT
Group: Development/Libraries/C and C++
Url: http://glm.g-truc.net/
Source0: https://github.com/g-truc/glm/releases/download/%{version}/%{name}-%{version}.zip
URL: https://glm.g-truc.net/
#Git-Clone: https://github.com/g-truc/glm.git
Source: https://github.com/g-truc/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
# PATCH-FIX-OPENSUSE glm-cmake-config.patch -- Fix cmake config location
Patch1: glm-cmake-config.patch
BuildRequires: cmake
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: unzip
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: pkgconfig
%description
OpenGL Mathematics (GLM) is a header only C++ mathematics library for graphics
@ -62,12 +62,8 @@ BuildArch: noarch
This package provides the documentation for GLM library.
%prep
%setup -q -n %{name}
# Fix wrong-file-end-of-line-encoding
sed -i 's/\r//' copying.txt
sed -i 's/\r//' readme.md
sed -i 's/\r//' doc/api/doxygen.css
sed -i 's/\r//' doc/api/tabs.css
%setup -q
%patch1 -p1
%ifarch %{ix86}
sed -i '/glmCreateTestGTC(core_func_exponential)/d' test/core/CMakeLists.txt
# https://github.com/g-truc/glm/issues/212
@ -80,31 +76,30 @@ sed -i '/glmCreateTestGTC(gtc_integer)/d' test/gtc/CMakeLists.txt
sed -i '/glmCreateTestGTC(gtx_common)/d' test/gtx/CMakeLists.txt
%endif
%endif
%patch1
%build
%cmake \
-DCMAKE_CXX_FLAGS="%{optflags} -fPIC -fno-strict-aliasing" \
-DGLM_TEST_ENABLE=ON
make %{?_smp_mflags}
%make_jobs
%install
%cmake_install
%fdupes -s %{buildroot}
%fdupes -s doc/api
%check
%ctest
%files devel
%defattr(-,root,root,-)
%{_includedir}/glm/
%{_libdir}/cmake/%{name}/
%doc copying.txt
%{_libdir}/pkgconfig/%{name}.pc
%files doc
%defattr(-,root,root,-)
# See https://github.com/g-truc/glm/blob/master/manual.md#-licenses for license details
%license readme.md
%doc doc/api
%doc doc/glm.pdf
%doc readme.md
%doc manual.md readme.md
%changelog