10:13 p.m.
Author: hobbes1069
Update of /cvs/nonfree/rpms/smesh/EL-6
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv15620
Modified Files:
smesh.spec
Added Files:
smesh-OCE_0.13_port.patch
Log Message:
* Thu Oct 10 2013 Richard Shaw <hobbes1069(a)gmail.com> - 5.1.2.2-8.svn55
- Rebuild for OCE-0.13.
smesh-OCE_0.13_port.patch:
StdMeshers_RadialPrism_3D.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--- NEW FILE smesh-OCE_0.13_port.patch ---
diff -Naur smesh-5.1.2.2.svn55.orig/src/StdMeshers/StdMeshers_RadialPrism_3D.cpp
smesh-5.1.2.2.svn55/src/StdMeshers/StdMeshers_RadialPrism_3D.cpp
--- smesh-5.1.2.2.svn55.orig/src/StdMeshers/StdMeshers_RadialPrism_3D.cpp 2009-12-16
09:01:21.000000000 -0600
+++ smesh-5.1.2.2.svn55/src/StdMeshers/StdMeshers_RadialPrism_3D.cpp 2013-09-22
21:30:43.995137618 -0500
@@ -46,6 +46,7 @@
#include <BRepBuilderAPI_MakeEdge.hxx>
#include <BRepTools.hxx>
#include <BRep_Tool.hxx>
+#include <BRepClass3d.hxx>
#include <TopExp_Explorer.hxx>
#include <TopoDS.hxx>
#include <TopoDS_Shell.hxx>
@@ -161,7 +163,7 @@
// get 2 shells
TopoDS_Solid solid = TopoDS::Solid( aShape );
- TopoDS_Shell outerShell = BRepTools::OuterShell( solid );
+ TopoDS_Shell outerShell = BRepClass3d::OuterShell( solid );
TopoDS_Shape innerShell;
int nbShells = 0;
for ( TopoDS_Iterator It (solid); It.More(); It.Next(), ++nbShells )
@@ -401,7 +403,7 @@
{
// get 2 shells
TopoDS_Solid solid = TopoDS::Solid( aShape );
- TopoDS_Shell outerShell = BRepTools::OuterShell( solid );
+ TopoDS_Shell outerShell = BRepClass3d::OuterShell( solid );
TopoDS_Shape innerShell;
int nbShells = 0;
for ( TopoDS_Iterator It (solid); It.More(); It.Next(), ++nbShells )
Index: smesh.spec
===================================================================
RCS file: /cvs/nonfree/rpms/smesh/EL-6/smesh.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- smesh.spec 22 Oct 2012 20:13:33 -0000 1.4
+++ smesh.spec 11 Oct 2013 22:13:54 -0000 1.5
@@ -3,9 +3,11 @@
%global cmake %cmake28
%endif
+%global svnrev 55
+
Name: smesh
Version: 5.1.2.2
-Release: 5.svn54%{?dist}
+Release: 8.svn%{svnrev}%{?dist}
Summary: OpenCascade based MESH framework
# This library is LGPLv2+ but links against the non-free library OCE.
@@ -14,13 +16,16 @@
# 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
+# http://tracker.dev.opencascade.org/view.php?id=23487
+Patch4: smesh-OCE_0.13_port.patch
%if 0%{?rhel}
BuildRequires: cmake28
@@ -61,10 +66,12 @@
%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
+%patch4 -p1 -b .oce-0.13
dos2unix -k LICENCE.lgpl.txt
@@ -108,6 +115,18 @@
%changelog
+* Thu Oct 10 2013 Richard Shaw <hobbes1069(a)gmail.com> - 5.1.2.2-8.svn55
+- Rebuild for OCE-0.13.
+
+* Mon Jul 15 2013 Richard Shaw <hobbes1069(a)gmail.com> - 5.1.2.2-7.svn55
+- Rebuild for updated OCE.
+
+* Fri Jun 21 2013 Richard Shaw <hobbes1069(a)gmail.com> - 5.1.2.2-6.svn55
+- Rebuild for OCE 0.12.
+
+* 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.