rpms/smesh/devel smesh-5.1.2.2-rm_f2c.patch, NONE, 1.1 smesh.spec, 1.4, 1.5
Author: hobbes1069
Update of /cvs/nonfree/rpms/smesh/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv30314
Modified Files:
smesh.spec
Added Files:
smesh-5.1.2.2-rm_f2c.patch
Log Message:
* 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.
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/devel/smesh.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- smesh.spec 26 Sep 2012 13:41:28 -0000 1.4
+++ smesh.spec 22 Oct 2012 19:48:37 -0000 1.5
@@ -1,6 +1,11 @@
+# Use a newer version of cmake on EL.
+%if 0%{?rhel}
+%global cmake %cmake28
+%endif
+
Name: smesh
Version: 5.1.2.2
-Release: 4.svn54%{?dist}
+Release: 5.svn54%{?dist}
Summary: OpenCascade based MESH framework
# This library is LGPLv2+ but links against the non-free library OCE.
@@ -15,18 +20,28 @@
# on 12/21/11.
Patch0: smesh.patch
Patch1: smesh-cmake_fixes.patch
+Patch2: smesh-5.1.2.2-rm_f2c.patch
-BuildRequires: cmake doxygen
+%if 0%{?rhel}
+BuildRequires: cmake28
+%else
+BuildRequires: cmake
+%endif
+BuildRequires: doxygen graphviz
BuildRequires: OCE-devel
BuildRequires: boost-devel
BuildRequires: gcc-gfortran
-BuildRequires: f2c
+# Do we need this?
+#BuildRequires: f2c f2c-devel
BuildRequires: dos2unix
%description
A complete OpenCascade based MESH framework.
+NOTE: Fortran support (f2c) has been disabled. If it is needed please open a
+bug against the smesh component at: http://bugzilla.rpmfusion.org
+
%package doc
Summary: Development documentation for %{name}
@@ -49,6 +64,7 @@
%setup -q -c %{name}-%{version}
%patch0 -p1
%patch1 -p1 -b .cmakefix
+%patch2 -p1 -b .f2c
dos2unix -k LICENCE.lgpl.txt
@@ -92,6 +108,10 @@
%changelog
+* 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.
+
* Wed Sep 26 2012 Richard Shaw <hobbes1069(a)gmail.com> - 5.1.2.2-4.svn54
- Rebuild due to package not being signed in F-18 repo.