6:16 p.m.
Author: hobbes1069
Update of /cvs/nonfree/rpms/smesh/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv30728
Modified Files:
smesh.spec sources
Added Files:
smesh-5.1.2.2-pi_to_m_pi.patch smesh-5.1.2.2-rm_f2c.patch
Log Message:
* Fri Feb 15 2013 Richard Shaw <hobbes1069(a)gmail.com> - 5.1.2.2-1.svn55
- Update for compatibility with new OCE.
smesh-5.1.2.2-pi_to_m_pi.patch:
Controls/SMESH_Controls.cpp | 5 +++++
SMESH/SMESH_MeshEditor.cpp | 4 ++++
SMESH/SMESH_Pattern.cpp | 5 +++++
StdMeshers/StdMeshers_AutomaticLength.cpp | 5 +++++
StdMeshers/StdMeshers_CompositeHexa_3D.cpp | 4 ++++
StdMeshers/StdMeshers_QuadToTriaAdaptor.cpp | 5 +++++
StdMeshers/StdMeshers_RadialQuadrangle_1D2D.cpp | 4 ++++
7 files changed, 32 insertions(+)
--- NEW FILE smesh-5.1.2.2-pi_to_m_pi.patch ---
diff -Naur smesh-5.1.2.2.orig/src/Controls/SMESH_Controls.cpp
smesh-5.1.2.2/src/Controls/SMESH_Controls.cpp
--- smesh-5.1.2.2.orig/src/Controls/SMESH_Controls.cpp 2009-12-16 09:01:21.000000000
-0600
+++ smesh-5.1.2.2/src/Controls/SMESH_Controls.cpp 2013-02-15 14:58:28.357147721 -0600
@@ -64,6 +64,11 @@
#include "SMESHDS_Mesh.hxx"
#include "SMESHDS_GroupBase.hxx"
+#ifndef PI
+# include <math.h>
+# define PI M_PI
+#endif
+
/*
AUXILIARY METHODS
*/
diff -Naur smesh-5.1.2.2.orig/src/SMESH/SMESH_MeshEditor.cpp
smesh-5.1.2.2/src/SMESH/SMESH_MeshEditor.cpp
--- smesh-5.1.2.2.orig/src/SMESH/SMESH_MeshEditor.cpp 2013-02-15 14:42:44.453062739 -0600
+++ smesh-5.1.2.2/src/SMESH/SMESH_MeshEditor.cpp 2013-02-15 14:51:15.754435891 -0600
@@ -84,6 +84,10 @@
#define cast2Node(elem) static_cast<const SMDS_MeshNode*>( elem )
+#ifndef PI
+# define PI M_PI
+#endif
+
using namespace std;
using namespace SMESH::Controls;
diff -Naur smesh-5.1.2.2.orig/src/SMESH/SMESH_Pattern.cpp
smesh-5.1.2.2/src/SMESH/SMESH_Pattern.cpp
--- smesh-5.1.2.2.orig/src/SMESH/SMESH_Pattern.cpp 2013-02-15 14:42:44.457062609 -0600
+++ smesh-5.1.2.2/src/SMESH/SMESH_Pattern.cpp 2013-02-15 14:55:31.929960525 -0600
@@ -75,6 +75,11 @@
#include "utilities.h"
+#ifndef PI
+# include <math.h>
+# define PI M_PI
+#endif
+
using namespace std;
typedef map< const SMDS_MeshElement*, int > TNodePointIDMap;
diff -Naur smesh-5.1.2.2.orig/src/StdMeshers/StdMeshers_AutomaticLength.cpp
smesh-5.1.2.2/src/StdMeshers/StdMeshers_AutomaticLength.cpp
--- smesh-5.1.2.2.orig/src/StdMeshers/StdMeshers_AutomaticLength.cpp 2009-12-16
09:01:21.000000000 -0600
+++ smesh-5.1.2.2/src/StdMeshers/StdMeshers_AutomaticLength.cpp 2013-02-15
15:00:49.259529380 -0600
@@ -38,6 +38,11 @@
#include <TopoDS.hxx>
#include <TopoDS_Edge.hxx>
+#ifndef PI
+# include <math.h>
+# define PI M_PI
+#endif
+
using namespace std;
//=============================================================================
diff -Naur smesh-5.1.2.2.orig/src/StdMeshers/StdMeshers_CompositeHexa_3D.cpp
smesh-5.1.2.2/src/StdMeshers/StdMeshers_CompositeHexa_3D.cpp
--- smesh-5.1.2.2.orig/src/StdMeshers/StdMeshers_CompositeHexa_3D.cpp 2009-12-16
09:01:21.000000000 -0600
+++ smesh-5.1.2.2/src/StdMeshers/StdMeshers_CompositeHexa_3D.cpp 2013-02-15
15:03:10.805901650 -0600
@@ -57,6 +57,10 @@
#include <set>
#include <vector>
+#ifndef PI
+# include <math.h>
+# define PI M_PI
+#endif
#ifdef _DEBUG_
diff -Naur smesh-5.1.2.2.orig/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cpp
smesh-5.1.2.2/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cpp
--- smesh-5.1.2.2.orig/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cpp 2009-12-16
09:01:21.000000000 -0600
+++ smesh-5.1.2.2/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cpp 2013-02-15
15:05:12.937914205 -0600
@@ -40,6 +40,11 @@
#include <gp_Lin.hxx>
#include <gp_Pln.hxx>
+#ifndef PI
+# include <math.h>
+# define PI M_PI
+#endif
+
#ifndef __BORLANDC__
#include <NCollection_Array1.hxx>
typedef NCollection_Array1<TColStd_SequenceOfInteger>
StdMeshers_Array1OfSequenceOfInteger;
diff -Naur smesh-5.1.2.2.orig/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.cpp
smesh-5.1.2.2/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.cpp
--- smesh-5.1.2.2.orig/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.cpp 2009-12-16
09:01:21.000000000 -0600
+++ smesh-5.1.2.2/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.cpp 2013-02-15
15:09:28.717572007 -0600
@@ -55,6 +55,10 @@
#include <TopExp_Explorer.hxx>
#include <TopoDS.hxx>
+#ifndef PI
+# include <math.h>
+# define PI M_PI
+#endif
using namespace std;
smesh-5.1.2.2-rm_f2c.patch:
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE smesh-5.1.2.2-rm_f2c.patch ---
diff -Naur smesh-5.1.2.2.orig/CMakeLists.txt smesh-5.1.2.2/CMakeLists.txt
--- smesh-5.1.2.2.orig/CMakeLists.txt 2012-07-05 10:03:58.241643809 -0500
+++ smesh-5.1.2.2/CMakeLists.txt 2012-07-05 10:04:37.340404971 -0500
@@ -160,7 +160,7 @@
INCLUDE_DIRECTORIES(src/StdMeshers)
ADD_LIBRARY(StdMeshers SHARED ${StdMeshers_source_files})
-TARGET_LINK_LIBRARIES(StdMeshers SMESH TKernel TKMath TKAdvTools f2c)
+TARGET_LINK_LIBRARIES(StdMeshers SMESH TKernel TKMath TKAdvTools)
###########
# INSTALL #
Index: smesh.spec
===================================================================
RCS file: /cvs/nonfree/rpms/smesh/F-17/smesh.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- smesh.spec 22 Oct 2012 20:34:51 -0000 1.3
+++ smesh.spec 19 Feb 2013 18:16:58 -0000 1.4
@@ -3,9 +3,11 @@
%global cmake %cmake28
%endif
+%global svnrev 55
+
Name: smesh
Version: 5.1.2.2
-Release: 5.svn54%{?dist}
+Release: 6.svn%{svnrev}%{?dist}
Summary: OpenCascade based MESH framework
# This library is LGPLv2+ but links against the non-free library OCE.
@@ -14,13 +16,14 @@
# Source is svn checkout since the last release is too old:
# https://salomesmesh.svn.sourceforge.net/svnroot/salomesmesh/trunk
-Source0: smesh-5.1.2.2-svn54.tar.gz
+Source0: %{name}-%{version}.svn%{svnrev}.tar.gz
# Patch emailed upstream to Fotios Sioutis <sfotis(a)gmail.com>
# on 12/21/11.
Patch0: smesh.patch
Patch1: smesh-cmake_fixes.patch
Patch2: smesh-5.1.2.2-rm_f2c.patch
+Patch3: smesh-5.1.2.2-pi_to_m_pi.patch
%if 0%{?rhel}
BuildRequires: cmake28
@@ -61,10 +64,11 @@
%prep
-%setup -q -c %{name}-%{version}
+%setup -q -n %{name}-%{version}.svn%{svnrev}
%patch0 -p1
%patch1 -p1 -b .cmakefix
%patch2 -p1 -b .f2c
+%patch3 -p1 -b .pi
dos2unix -k LICENCE.lgpl.txt
@@ -108,6 +112,9 @@
%changelog
+* Fri Feb 15 2013 Richard Shaw <hobbes1069(a)gmail.com> - 5.1.2.2-1.svn55
+- Update for compatibility with new OCE.
+
* Mon Oct 22 2012 Richard Shaw <hobbes1069(a)gmail.com> - 5.1.2.2-5.svn54
- Remove build requirement for fortran (f2c).
- Initial packaging for EPEL 6.
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/smesh/F-17/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 27 Jan 2012 19:48:26 -0000 1.2
+++ sources 19 Feb 2013 18:16:58 -0000 1.3
@@ -1 +1 @@
-00ed8a488d1ddeb05d1777430094df80 smesh-5.1.2.2-svn54.tar.gz
+2b8ae645c029715737265561ccfa3551 smesh-5.1.2.2.svn55.tar.gz