hobbes1069 pushed to OCE (f20). "Update to latest upstream release."

[notifications at fedoraproject.org]

>From a565c8d959c7183531383b83ebb4c49a91c6c93f Mon Sep 17 00:00:00 2001
From: "Richard M. Shaw" <hobbes1069 at gmail.com>
Date: Fri, 24 Apr 2015 09:30:03 -0500
Subject: Update to latest upstream release.


diff --git a/.gitignore b/.gitignore
index 0dbf28c..558aa55 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /OCE-0.15.tar.gz
 /OCE-0.16.tar.gz
+/oce-OCE-0.16.1.tar.gz
diff --git a/OCE.spec b/OCE.spec
index d2a9fd1..4bd6e9e 100644
--- a/OCE.spec
+++ b/OCE.spec
@@ -1,19 +1,17 @@
-#global relcan 0
-%global commit 1516f8d2c7dbe51f9341f26f0d1d8f73e47f5068
-
-# Use newer cmake on EL-6.
-%if 0%{?rhel} && 0%{?rhel} <= 6
-%global cmake %cmake28
-%endif
+%global commit 4f9c1130e1fd46a66729039f1f18ea7c29c6eac0
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global ver_major 0
+%global ver_minor 16
+%global ver_patch 1
 
 Name:           OCE
-Version:        0.16
-Release:        1%{?relcan:.rc%{relcan}}%{?dist}.1
+Version:        %{ver_major}.%{ver_minor}%{?ver_patch:.%{ver_patch}}
+Release:        1%{?relcan:.rc%{relcan}}%{?dist}
 Summary:        OpenCASCADE Community Edition
 
 License:        LGPLv2 with exception
 URL:            https://github.com/tpaviot/oce
-Source0:        https://github.com/tpaviot/oce/archive/%{commit}/%{name}-%{version}%{?relcan:-rc%{relcan}}.tar.gz
+Source0:        https://github.com/tpaviot/oce/archive/%{commit}/oce-%{name}-%{version}%{?relcan:-rc%{relcan}}.tar.gz
 
 Source1:        DRAWEXE.1
 Source2:        opencascade-draw.desktop
@@ -23,11 +21,7 @@ Source5:        oce-64.png
 Source6:        oce-48.png
 
 # Utilities
-%if 0%{?rhel} && 0%{?rhel} <= 6
-BuildRequires:  cmake28
-%else
 BuildRequires:  cmake
-%endif
 BuildRequires:  desktop-file-utils
 # Libraries
 BuildRequires:  xorg-x11-proto-devel
@@ -42,10 +36,10 @@ BuildRequires:  libgomp
 BuildRequires:  tcl-devel
 BuildRequires:  tk-devel
 %ifnarch %arm
-  %if 0%{?rhel}
-BuildRequires:  openmpi-devel
-  %else
+  %if 0%{?fedora} || 0%{?rhel} > 6
 BuildRequires:  tbb-devel
+  %else
+BuildRequires:  openmpi-devel
   %endif
 %endif
 
@@ -130,28 +124,40 @@ Requires:       %{name}-foundation%{?_isa} = %{version}-%{release}
 Requires:       %{name}-modeling%{?_isa} = %{version}-%{release}
 Requires:       %{name}-ocaf%{?_isa} = %{version}-%{release}
 Requires:       %{name}-visualization%{?_isa} = %{version}-%{release}
+Requires:       freeimage-devel
+Requires:       freetype-devel
+Requires:       gl2ps-devel
+Requires:       libICE-devel
+Requires:       libSM-devel
+Requires:       libX11-devel
+Requires:       libXext-devel
+Requires:       mesa-libGL-devel
+Requires:       mesa-libGLU-devel
+Requires:       tbb-devel
+Requires:       tcl-devel
+Requires:       tk-devel
 
 %description devel
 OpenCASCADE CAE platform library development files
 
 
 %prep
-%setup -q -n oce-%{commit}
+%setup -q -n oce-%{name}-%{version}
 
 
 %build
 rm -rf build && mkdir build && pushd build
 # Stop excessive linking that cmake projects are prone to. 
 export LDFLAGS="-Wl,--as-needed"
-%cmake -DOCE_BUILD_TYPE=RelWithDebInfo \
+%cmake -DCMAKE_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 \
-%else
+%if 0%{?fedora} || 0%{?rhel} > 6
        -DOCE_MULTITHREAD_LIBRARY:STRING=TBB \
+%else
+       -DOCE_MULTITHREAD_LIBRARY:STRING=OPENMP \
 %endif
        -DOCE_DRAW=ON \
        -DOCE_TESTING=ON \
@@ -183,6 +189,7 @@ done
 
 %check
 pushd build/test
+export CTEST_OUTPUT_ON_FAILURE=1
 make test
 
 
@@ -217,7 +224,7 @@ fi
 %{_libdir}/libTKernel.so.*
 %{_libdir}/libTKMath.so.*
 %{_libdir}/libTKAdvTools.so.*
-%{_datadir}/oce-%{version}/
+%{_datadir}/oce-%{ver_major}.%{ver_minor}/
 
 %files modeling
 # Modeling Data
@@ -287,14 +294,14 @@ fi
 
 %files draw
 # Draw Libraries
-%dir %{_libdir}/oce-%{version}
-%{_libdir}/oce-%{version}/libTKDraw.so.*
-%{_libdir}/oce-%{version}/libTKTopTest.so.*
-%{_libdir}/oce-%{version}/libTKViewerTest.so.*
-%{_libdir}/oce-%{version}/libTKXSDRAW.so.*
-%{_libdir}/oce-%{version}/libTKDCAF.so.*
-%{_libdir}/oce-%{version}/libTKXDEDRAW.so.*
-%{_libdir}/oce-%{version}/libTKTObjDRAW.so.*
+%dir %{_libdir}/oce-%{ver_major}.%{ver_minor}
+%{_libdir}/oce-%{ver_major}.%{ver_minor}/libTKDraw.so.*
+%{_libdir}/oce-%{ver_major}.%{ver_minor}/libTKTopTest.so.*
+%{_libdir}/oce-%{ver_major}.%{ver_minor}/libTKViewerTest.so.*
+%{_libdir}/oce-%{ver_major}.%{ver_minor}/libTKXSDRAW.so.*
+%{_libdir}/oce-%{ver_major}.%{ver_minor}/libTKDCAF.so.*
+%{_libdir}/oce-%{ver_major}.%{ver_minor}/libTKXDEDRAW.so.*
+%{_libdir}/oce-%{ver_major}.%{ver_minor}/libTKTObjDRAW.so.*
 # DRAWEXE application
 %{_bindir}/DRAWEXE
 %{_mandir}/man1/DRAWEXE.1.gz
@@ -305,11 +312,14 @@ fi
 %doc examples
 %{_includedir}/*
 %{_libdir}/*.so
-%{_libdir}/oce-%{version}/*.so
-%{_libdir}/oce-%{version}/*.cmake
+%{_libdir}/oce-%{ver_major}.%{ver_minor}/*.so
+%{_libdir}/oce-%{ver_major}.%{ver_minor}/*.cmake
 
 
 %changelog
+* Fri Apr 24 2015 Richard Shaw <hobbes1069 at gmail.com> - 0.16.1-1
+- Update to latest upstream release.
+
 * Fri Aug 15 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.16-1.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index 379a6e1..e4bbe49 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7f95a4a389876f4410bdeba85b2c8272  OCE-0.16.tar.gz
+4d591b240c9293e879f50d86a0cb2bb3  oce-OCE-0.16.1.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/OCE.git/commit/?h=f20&id=a565c8d959c7183531383b83ebb4c49a91c6c93f