6:01 p.m.
Author: hobbes1069
Update of /cvs/nonfree/rpms/OCE/EL-6
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv20045
Modified Files:
OCE.spec sources
Log Message:
* Thu Oct 10 2013 Richard Shaw <hobbes1069(a)gmail.com. - 0.13-1
- Update to latest upstream release.
Index: OCE.spec
===================================================================
RCS file: /cvs/nonfree/rpms/OCE/EL-6/OCE.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- OCE.spec 5 Jul 2012 13:31:31 -0000 1.3
+++ OCE.spec 11 Oct 2013 18:01:08 -0000 1.4
@@ -1,5 +1,3 @@
-%global githash1 gc4c7d83
-%global githash2 de78904
#global relcan 1
# Use newer cmake on EL-6.
@@ -8,17 +6,15 @@
%endif
Name: OCE
-Version: 0.8.0
-Release: 3%{?relcan:.rc%{relcan}}%{?dist}
+Version: 0.13
+Release: 1%{?relcan:.rc%{relcan}}%{?dist}
Summary: OpenCASCADE Community Edition
License: Open CASCADE Technology Public License
URL: https://github.com/tpaviot/oce
# Github source! Archive was generated on the fly with the following URL:
-# https://github.com/tpaviot/oce/tarball/OCE-0.8.0
-Source0:
tpaviot-oce-%{name}-%{version}%{?relcan:-rc%{relcan}}-0-%{githash1}.tar.gz
-
-Patch0: OCE-0.8.0-env.patch
+# https://github.com/tpaviot/oce/archive/OCE-0.13.tar.gz
+Source0:
https://github.com/tpaviot/oce/archive/%{name}-%{version}%{?relcan:-rc%{r...
Source1: DRAWEXE.1
Source2: opencascade-draw.desktop
@@ -34,16 +30,25 @@
BuildRequires: cmake
%endif
BuildRequires: desktop-file-utils
-# Librraies
+# Libraries
BuildRequires: xorg-x11-proto-devel
BuildRequires: mesa-libGL-devel mesa-libGLU-devel
BuildRequires: libXmu-devel
-BuildRequires: ftgl-devel
+BuildRequires: ftgl-devel
+%if ! 0%{?el6}
BuildRequires: freeimage-devel
+%endif
BuildRequires: gl2ps-devel
BuildRequires: libgomp
BuildRequires: tcl-devel
BuildRequires: tk-devel
+%ifnarch %arm
+ %if 0%{?rhel}
+BuildRequires: openmpi-devel
+ %else
+BuildRequires: tbb-devel
+ %endif
+%endif
%description
@@ -129,8 +134,7 @@
%prep
-%setup -q -n tpaviot-oce-%{githash2}
-%patch0 -p1
+%setup -q -n oce-%{name}-%{version}
# Convert files to utf8
iconv --from=ISO-8859-1 --to=UTF-8 LICENSE.txt > LICENSE.txt.new && \
@@ -140,14 +144,20 @@
%build
rm -rf build && mkdir build && pushd build
+# Stop excessive linking that cmake projects are prone to.
LDFLAGS="-Wl,--as-needed";export LDFLAGS
%cmake -DOCE_BUILD_TYPE=RelWithDebInfo \
-DOCE_INSTALL_PREFIX=%{_prefix} \
-DOCE_INSTALL_LIB_DIR=%{_lib} \
-DOCE_WITH_FREEIMAGE=ON \
-DOCE_WITH_GL2PS=ON \
+%if 0%{?rhel}
-DOCE_MULTITHREAD_LIBRARY:STRING=OPENMP \
- -DOCE_DRAW=on \
+%else
+ -DOCE_MULTITHREAD_LIBRARY:STRING=TBB \
+%endif
+ -DOCE_DRAW=ON \
+ -DOCE_TESTING=ON \
../
make %{?_smp_mflags}
@@ -156,6 +166,7 @@
%install
pushd build
make install DESTDIR=%{buildroot}
+popd
# Remove empty .gxx files
find %{buildroot}%{_includedir} -name "*.gxx" -exec rm -f {} \;
@@ -176,6 +187,11 @@
done
+%check
+pushd build/test
+make test
+
+
%post foundation -p /sbin/ldconfig
%postun foundation -p /sbin/ldconfig
@@ -247,7 +263,6 @@
%files visualization
# Visualization Dependents
%{_libdir}/libTKService.so.*
-%{_libdir}/libTKV2d.so.*
%{_libdir}/libTKV3d.so.*
# Visualization
%{_libdir}/libTKOpenGl.so.*
@@ -277,7 +292,7 @@
%{_libdir}/libTKStdSchema.so.*
%files draw
-# Draw
+# Draw Libraries
%{_libdir}/oce-%{version}%{?relcan:-rc%{relcan}}/libTKDraw.so.*
%{_libdir}/oce-%{version}%{?relcan:-rc%{relcan}}/libTKTopTest.so.*
%{_libdir}/oce-%{version}%{?relcan:-rc%{relcan}}/libTKViewerTest.so.*
@@ -285,6 +300,7 @@
%{_libdir}/oce-%{version}%{?relcan:-rc%{relcan}}/libTKDCAF.so.*
%{_libdir}/oce-%{version}%{?relcan:-rc%{relcan}}/libTKXDEDRAW.so.*
%{_libdir}/oce-%{version}%{?relcan:-rc%{relcan}}/libTKTObjDRAW.so.*
+%{_libdir}/oce-%{version}%{?relcan:-rc%{relcan}}/libTKQADraw.so.*
# DRAWEXE application
%{_bindir}/DRAWEXE
%{_mandir}/man1/DRAWEXE.1.gz
@@ -295,11 +311,23 @@
%doc examples
%{_includedir}/*
%{_libdir}/*.so
-%exclude %{_libdir}/oce-%{version}%{?relcan:-rc%{relcan}}/*.so.*
-%{_libdir}/oce-%{version}%{?relcan:-rc%{relcan}}/
+%{_libdir}/oce-%{version}%{?relcan:-rc%{relcan}}/*.so
+%{_libdir}/oce-%{version}%{?relcan:-rc%{relcan}}/*.cmake
%changelog
+* Thu Oct 10 2013 Richard Shaw <hobbes1069(a)gmail.com. - 0.13-1
+- Update to latest upstream release.
+
+* Mon Jul 15 2013 Richard Shaw <hobbes1069(a)gmail.com> - 0.12-1
+- Update to latest upstream release as it adds some performance enhancements.
+
+* Mon Feb 18 2013 Richard Shaw <hobbes1069(a)gmail.com> - 0.11-2
+- Add tbb-devel as build requirement.
+
+* Fri Feb 15 2013 Richard Shaw <hobbes1069(a)gmail.com> - 0.11-1
+- Update to latest upstream release.
+
* Wed May 02 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.8.0-3
- Update icons.
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/OCE/EL-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 24 Dec 2011 20:05:00 -0000 1.2
+++ sources 11 Oct 2013 18:01:08 -0000 1.3
@@ -1 +1 @@
-1ba89636b120b07bd72f18cf699425cd tpaviot-oce-OCE-0.8.0-0-gc4c7d83.tar.gz
+31d384f7b302e14f09fc08f5d6fae080 OCE-0.13.tar.gz