Hello community, here is the log from the commit of package glm for openSUSE:Factory checked in at 2016-03-29 09:52:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/glm (Old) and /work/SRC/openSUSE:Factory/.glm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "glm" Changes: -------- --- /work/SRC/openSUSE:Factory/glm/glm.changes 2014-09-28 19:55:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.glm.new/glm.changes 2016-03-29 09:52:59.000000000 +0200 @@ -1,0 +2,10 @@ +Mon Mar 21 19:13:24 UTC 2016 - [email protected] + +- Update to version 0.9.7.4 +- Fix cmake config location + * glm-cmake-config.patch +- Drop obsolete + * glm-0.9.5.3-no_gtc_packing_test.patch +- Drop aliasing.patch, use -fno-strict-aliasing + +------------------------------------------------------------------- Old: ---- aliasing.patch glm-0.9.5.3-no_gtc_packing_test.patch glm-0.9.5.3.zip New: ---- glm-0.9.7.4.zip glm-cmake-config.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glm.spec ++++++ --- /var/tmp/diff_new_pack.DbbS9z/_old 2016-03-29 09:53:00.000000000 +0200 +++ /var/tmp/diff_new_pack.DbbS9z/_new 2016-03-29 09:53:00.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package glm # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -17,22 +17,20 @@ Name: glm -Version: 0.9.5.3 +Version: 0.9.7.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: http://downloads.sourceforge.net/ogl-math/%{name}-%{version}.zip -Patch0: glm-0.9.5.3-no_gtc_packing_test.patch -Patch1: aliasing.patch +Source0: https://github.com/g-truc/glm/releases/download/%{version}/%{name}-%{version}.zip +# PATCH-FIX-OPENSUSE glm-cmake-config.patch -- Fix cmake config location +Patch1: glm-cmake-config.patch BuildRequires: cmake -BuildRequires: dos2unix BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: unzip BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch %description OpenGL Mathematics (GLM) is a header only C++ mathematics library for graphics @@ -45,6 +43,7 @@ %package devel Summary: Header only C++ mathematics library for graphics Group: Development/Libraries/C and C++ +Requires: cmake %description devel OpenGL Mathematics (GLM) is a header only C++ mathematics library for graphics @@ -57,6 +56,7 @@ %package doc Summary: Documentation for GLM library Group: Documentation/Other +BuildArch: noarch %description doc This package provides the documentation for GLM library. @@ -64,35 +64,47 @@ %prep %setup -q -n %{name} # Fix wrong-file-end-of-line-encoding -find ./ -type f -print0 |xargs -0 dos2unix -q -%patch0 -p1 +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 +%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 %patch1 -p1 %build %cmake \ - -DCMAKE_CXX_FLAGS="$RPM_OPT_FLAGS" \ + -DCMAKE_CXX_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ -DGLM_TEST_ENABLE=ON make %{?_smp_mflags} %install %cmake_install -install -D -m 644 util/FindGLM.cmake %{buildroot}%{_datadir}/cmake/Modules/FindGLM.cmake %fdupes -s %{buildroot} %check -cd build -ctest %{?_smp_mflags} --output-on-failure +%ctest %files devel %defattr(-,root,root,-) -%{_includedir}/glm -%{_datadir}/cmake/Modules/FindGLM.cmake +%{_includedir}/glm/ +%{_libdir}/cmake/%{name}/ %doc copying.txt %files doc %defattr(-,root,root,-) %doc doc/api %doc doc/glm.pdf -%doc readme.txt +%doc readme.md %changelog ++++++ glm-cmake-config.patch ++++++ Index: glm/CMakeLists.txt =================================================================== --- glm.orig/CMakeLists.txt +++ glm/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} )
