diff --git a/octave-iso2mesh.spec b/octave-iso2mesh.spec index 700d2df..b402cc9 100644 --- a/octave-iso2mesh.spec +++ b/octave-iso2mesh.spec @@ -2,12 +2,13 @@ Name: octave-%{octpkg} Version: 1.9.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A 3D surface and volumetric mesh generator for MATLAB/Octave # Main package: GPLv3+ -# JMeshLib: GPLv2 +# Meshfix: GPLv2+ +# JMeshLib: GPLv2+ # Tetgen: AGPLv3+ -License: GPLv3+ and GPLv2 and AGPLv3+ +License: GPLv3+ and GPLv2+ and AGPLv3+ URL: http://iso2mesh.sf.net # the following utilities are called internally by iso2mesh (stored under a private folder), @@ -22,9 +23,9 @@ ExcludeArch: armv7hl BuildRequires: cmake CGAL-devel SuperLU-devel blas-static gcc-c++ zlib-devel octave-devel %if 0%{?fedora} >=32 -Requires: octave mpfr-devel gmp-devel boost-devel SuperLU +Requires: octave mpfr-devel boost-devel SuperLU octave-jsonlab octave-jnifti octave-zmat %else -Requires: octave CGAL SuperLU gmp-devel +Requires: octave CGAL SuperLU octave-jsonlab octave-jnifti octave-zmat %endif Requires(post): octave @@ -87,7 +88,8 @@ Description: Iso2Mesh is a MATLAB/Octave-based mesh generation toolbox, medical imaging data analysis and multi-physics modeling. Iso2Mesh is cross-platform and is compatible with both MATLAB and GNU Octave. - +URL: %{url} +Depends: jnifti, jsonlab, zmat Categories: Mesh EOF @@ -96,8 +98,6 @@ iso2mesh >> Iso2Mesh Iso2Mesh advancefront barydualmesh - base64decode - base64encode bbxflatsegment binsurface bwislands @@ -115,7 +115,6 @@ Iso2Mesh extrudesurf faceneighbors fallbackexeext - fast_match_bracket fillholes3d fillsurf finddisconnsurf @@ -125,8 +124,6 @@ Iso2Mesh getoptkey getplanefrom3pt getvarfrom - gzipdecode - gzipencode highordertet i2m imedge3d @@ -136,27 +133,10 @@ Iso2Mesh internalpoint iso2meshver isoctavemesh - jdatadecode - jdataencode - jnifticreate jsonopt latticegrid - loadjnifti - loadjson - loadmsgpack - loadnifti - loadubjson - lz4decode - lz4encode - lz4hcdecode - lz4hcencode - lzipdecode - lzipencode - lzmadecode - lzmaencode m2v maskdist - match_bracket maxsurf mcpath memmapstream @@ -187,11 +167,6 @@ Iso2Mesh meshunitsphere mwpath neighborelem - nestbracket2dim - nifticreate - nii2jnii - niicodemap - niiformat nodevolume orderloopedge orthdisk @@ -208,7 +183,6 @@ Iso2Mesh readinr readmedit readmptiff - readnifti readnirfast readoff readsmf @@ -225,19 +199,14 @@ Iso2Mesh saveabaqus saveasc savebinstl - savebnii savedxf savegts saveinr savejmesh - savejnifti - savejnii savejson savemedit savemphtxt - savemsgpack savemsh - savenifti savenirfast saveoff savesmf @@ -245,7 +214,6 @@ Iso2Mesh savesurfpoly savetetgenele savetetgennode - saveubjson savevrml smoothbinvol smoothsurf @@ -277,11 +245,17 @@ Iso2Mesh vol2surf volface volmap2mesh - zlibdecode - zlibencode EOF mkdir -p inst/ + +rm -rf base64decode base64encode fast_match_bracket gzipdecode gzipencode \ +jdatadecode jdataencode jnifticreate loadjnifti loadjson loadmsgpack \ +loadnifti loadubjson lz4decode lz4encode lz4hcdecode lz4hcencode lzipdecode \ +lzipencode lzmadecode lzmaencode match_bracket nestbracket2dim nifticreate \ +nii2jnii niicodemap niiformat readnifti savebnii savejnifti savejnii \ +savemsgpack savenifti saveubjson zlibdecode zlibencode + mv *.m inst/ mv img2mesh.fig inst/ @@ -344,6 +318,10 @@ install -m 0755 -vp bin/* %{buildroot}%{_libexecdir}/%{octpkg}/ %doc sample %changelog +* Fri Oct 11 2019 Qianqian Fang - 1.9.1-3 +- Define octave package-level dependency via the DESCRIPTION file +- Remove gmp-devel from Requires + * Thu Oct 10 2019 Qianqian Fang - 1.9.1-2 - Fix licenses - Move binaries to libexec