Hello community,

here is the log from the commit of package glm for openSUSE:Factory checked in 
at 2013-08-06 06:55:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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  2013-07-22 12:59:29.000000000 
+0200
+++ /work/SRC/openSUSE:Factory/.glm.new/glm.changes     2013-08-06 
06:55:51.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Aug  1 11:01:03 UTC 2013 - dval...@suse.com
+
+- convert sources to UNIX format using dos2unix
+- fix build on non x86 architectures (glm-nonx86.patch) 
+
+-------------------------------------------------------------------

New:
----
  glm-nonx86.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ glm.spec ++++++
--- /var/tmp/diff_new_pack.vXqLOQ/_old  2013-08-06 06:55:52.000000000 +0200
+++ /var/tmp/diff_new_pack.vXqLOQ/_new  2013-08-06 06:55:52.000000000 +0200
@@ -24,9 +24,11 @@
 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
 BuildRequires:  cmake
+BuildRequires:  dos2unix
 BuildRequires:  gcc-c++
 BuildRequires:  unzip
 
@@ -61,9 +63,11 @@
 %prep
 %setup -q
 # Fix wrong-file-end-of-line-encoding
-sed -i 's/\r$//' copying.txt
-sed -i 's/\r$//' readme.txt
-sed -i 's/\r$//' doc/api/{tabs.css,jquery.js,dynsections.js,doxygen.css}
+find ./ -type f -print0 |xargs -0 dos2unix -q 
+
+%ifnarch %{ix86} x86_64
+%patch0 -p1
+%endif
 
 %build
 mkdir build


++++++ glm-nonx86.patch ++++++
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)
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to