From dcf4a8b4373ac827baa9ec27ebe52b47681361f88f9c0da8cb97250c81b5085f Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 16 May 2014 16:08:18 +0000 Subject: [PATCH] Accepting request 234276 from devel:libraries:c_c++ - Version bump to 0.9.5.3 - Add a patch to disable gtc_packing test that fails on some i586 systems: * glm-0.9.5.3-no_gtc_packing_test.patch - Add %fdupes to reduce size (forwarded request 234273 from fstrba) OBS-URL: https://build.opensuse.org/request/show/234276 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glm?expand=0&rev=4 --- glm-0.9.4.4.zip | 3 --- glm-0.9.5.3-no_gtc_packing_test.patch | 11 ++++++++ glm-0.9.5.3.zip | 3 +++ glm-nonx86.patch | 13 --------- glm.changes | 19 +++++++++++++ glm.spec | 39 +++++++++++---------------- 6 files changed, 48 insertions(+), 40 deletions(-) delete mode 100644 glm-0.9.4.4.zip create mode 100644 glm-0.9.5.3-no_gtc_packing_test.patch create mode 100644 glm-0.9.5.3.zip delete mode 100644 glm-nonx86.patch diff --git a/glm-0.9.4.4.zip b/glm-0.9.4.4.zip deleted file mode 100644 index c10f759..0000000 --- a/glm-0.9.4.4.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:434245b4495c0d87eb6bb80ff5a4d5d0babc37a9804e8999bad8a5b0a20a5a2b -size 5190773 diff --git a/glm-0.9.5.3-no_gtc_packing_test.patch b/glm-0.9.5.3-no_gtc_packing_test.patch new file mode 100644 index 0000000..b91bac9 --- /dev/null +++ b/glm-0.9.5.3-no_gtc_packing_test.patch @@ -0,0 +1,11 @@ +--- glm/test/gtc/CMakeLists.txt 2013-12-26 01:01:14.000000000 +0100 ++++ glm/test/gtc/CMakeLists.txt 2014-05-16 11:19:51.156369208 +0200 +@@ -5,7 +5,7 @@ + glmCreateTestGTC(gtc_matrix_inverse) + glmCreateTestGTC(gtc_matrix_transform) + glmCreateTestGTC(gtc_noise) +-glmCreateTestGTC(gtc_packing) ++#glmCreateTestGTC(gtc_packing) + glmCreateTestGTC(gtc_quaternion) + glmCreateTestGTC(gtc_random) + glmCreateTestGTC(gtc_reciprocal) diff --git a/glm-0.9.5.3.zip b/glm-0.9.5.3.zip new file mode 100644 index 0000000..d829bb3 --- /dev/null +++ b/glm-0.9.5.3.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3407f9d2a94d2576ed6bdcd25b1852a52b8ccb5ef035523967ff9e5b0557bc59 +size 4077373 diff --git a/glm-nonx86.patch b/glm-nonx86.patch deleted file mode 100644 index 048b1b6..0000000 --- a/glm-nonx86.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Nwur glm-0.9.4.4.orig/CMakeLists.txt glm-0.9.4.4/CMakeLists.txt ---- glm-0.9.4.4.orig/CMakeLists.txt 2013-08-01 12:15:16.575830000 +0200 -+++ glm-0.9.4.4/CMakeLists.txt 2013-08-01 12:16:05.579698000 +0200 -@@ -54,9 +54,6 @@ - - add_definitions(-DGLM_FORCE_PURE) - -- if(CMAKE_COMPILER_IS_GNUCXX) -- add_definitions(-mfpmath=387) -- endif() - endif() - - option(GLM_TEST_ENABLE_FAST_MATH "Enable fast math optimizations" OFF) diff --git a/glm.changes b/glm.changes index 769612a..88fb77a 100644 --- a/glm.changes +++ b/glm.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Fri May 16 09:09:02 UTC 2014 - fstrba@suse.com + +- Version bump to 0.9.5.3 +- Add a patch to disable gtc_packing test that fails on some i586 + systems: + * glm-0.9.5.3-no_gtc_packing_test.patch +- Add %fdupes to reduce size + +------------------------------------------------------------------- +Mon Mar 24 14:40:23 UTC 2014 - tchvatal@suse.com + +- Version bump to 0.9.5.2: + * Various bug fixes + * MIT only license +- Remove no longer needed patch: + * glm-nonx86.patch +- Use cmake macros to build + ------------------------------------------------------------------- Thu Aug 1 11:01:03 UTC 2013 - dvaleev@suse.com diff --git a/glm.spec b/glm.spec index fd02878..126f6ea 100644 --- a/glm.spec +++ b/glm.spec @@ -1,7 +1,7 @@ # # spec file for package glm # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products 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,20 +17,21 @@ Name: glm -Version: 0.9.4.4 +Version: 0.9.5.3 Release: 0 Summary: Header only C++ mathematics library for graphics -License: MIT and GPL-2.0+ +License: MIT Group: Development/Libraries/C and C++ Url: http://glm.g-truc.net/ -Source0: http://downloads.sourceforge.net/ogl-math/%{name}-%{version}/%{name}-%{version}.zip -Patch0: glm-nonx86.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch +Source0: http://downloads.sourceforge.net/ogl-math/%{name}-%{version}.zip +Patch0: glm-0.9.5.3-no_gtc_packing_test.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 @@ -59,35 +60,25 @@ Group: Documentation/Other %description doc This package provides the documentation for GLM library. - %prep -%setup -q +%setup -q -n %{name} # Fix wrong-file-end-of-line-encoding -find ./ -type f -print0 |xargs -0 dos2unix -q - -%ifnarch %{ix86} x86_64 +find ./ -type f -print0 |xargs -0 dos2unix -q %patch0 -p1 -%endif %build -mkdir build -cd build -cmake \ - -DGLM_TEST_ENABLE=ON \ - -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \ - .. - +%cmake \ + -DGLM_TEST_ENABLE=ON make %{?_smp_mflags} %install -cd build -make install DESTDIR="%buildroot" -cd .. +%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 %{?_smp_mflags} --output-on-failure %files devel %defattr(-,root,root,-)