[mmg3d] Update to 4.0.2

Sandro Mani smani at fedoraproject.org
Wed Feb 25 22:24:22 UTC 2015


commit 73145dbfc347862ea9845028dc2d76abd1a526da
Author: Sandro Mani <manisandro at gmail.com>
Date:   Wed Feb 25 23:24:14 2015 +0100

    Update to 4.0.2

 .gitignore        |  1 +
 mmg3d.spec        | 18 +++++++++++++-----
 mmg3d_cmake.patch | 10 +++++-----
 sources           |  2 +-
 4 files changed, 20 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 13b8c1a..35703f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /mmg3d4-4.0.1-Source.tar.gz
+/mmg3d4-4.0.2-Source.tar.gz
diff --git a/mmg3d.spec b/mmg3d.spec
index 7768527..c314677 100644
--- a/mmg3d.spec
+++ b/mmg3d.spec
@@ -4,14 +4,14 @@
 %global so_ver 4.0.1
 
 Name:           mmg3d
-Version:        4.0.1
-Release:        4%{?dist}
+Version:        4.0.2
+Release:        1%{?dist}
 Summary:        Anisotropic Tetrahedral Remesher / Moving Mesh Generator
 
 Group:          Applications/Engineering
 License:        GPLv3+
 URL:            http://www.math.u-bordeaux1.fr/~dobrzyns/logiciels/mmg3d.php
-Source0:        https://gforge.inria.fr/frs/download.php/file/33418/%{name}4-%{version}-Source.tar.gz
+Source0:        https://gforge.inria.fr/frs/download.php/file/34531/%{name}4-%{version}-Source.tar.gz
 
 # Fix install directories, pass soname for the shared library
 Patch0:         mmg3d_cmake.patch
@@ -48,7 +48,11 @@ Header files for %{name}.
 
 
 %build
-LDFLAGS="-Wl,--as-needed" %cmake -DLIBMMG3D4_STATIC=OFF -DLIBMMG3D4_SHARED=ON -DSO_VER=%{so_ver} .
+LDFLAGS="%{__global_ldflags} -Wl,--as-needed" %cmake \
+    -DLIBMMG3D4_STATIC=OFF \
+    -DLIBMMG3D4_SHARED=ON \
+    -DCMAKE_SKIP_RPATH=ON \
+    -DSO_VER=%{so_ver} .
 make %{?_smp_mflags}
 
 
@@ -65,7 +69,8 @@ make %{?_smp_mflags}
 %{_bindir}/%{name}4
 
 %files libs
-%doc Copyright.txt README.txt
+%doc README.txt
+%license Copyright.txt
 %{_libdir}/lib%{name}4.so.*
 
 %files devel
@@ -74,6 +79,9 @@ make %{?_smp_mflags}
 
 
 %changelog
+* Wed Feb 25 2015 Sandro Mani <manisandro at gmail.com> - 4.0.2-1
+- Update to 4.0.2
+
 * Sat Jan 03 2015 Sandro Mani <manisandro at gmail.com> - 4.0.1-4
 - Pass soname from spec
 - Merge patches together
diff --git a/mmg3d_cmake.patch b/mmg3d_cmake.patch
index fd37dd1..4b8f3a3 100644
--- a/mmg3d_cmake.patch
+++ b/mmg3d_cmake.patch
@@ -1,6 +1,6 @@
-diff -rupN mmg3d4-4.0.1-Source/CMakeLists.txt mmg3d4-4.0.1-Source-new/CMakeLists.txt
---- mmg3d4-4.0.1-Source/CMakeLists.txt	2014-02-24 11:20:32.000000000 +0100
-+++ mmg3d4-4.0.1-Source-new/CMakeLists.txt	2015-01-03 16:42:44.046583098 +0100
+diff -rupN mmg3d4-4.0.2-Source/CMakeLists.txt mmg3d4-4.0.2-Source-new/CMakeLists.txt
+--- mmg3d4-4.0.2-Source/CMakeLists.txt	2015-02-20 16:13:03.000000000 +0100
++++ mmg3d4-4.0.2-Source-new/CMakeLists.txt	2015-02-25 23:22:42.645629562 +0100
 @@ -4,6 +4,9 @@ PROJECT (mmg3d4)
  # To see flags and options of compilation
  #SET(CMAKE_VERBOSE_MAKEFILE TRUE)
@@ -11,7 +11,7 @@ diff -rupN mmg3d4-4.0.1-Source/CMakeLists.txt mmg3d4-4.0.1-Source-new/CMakeLists
  # Executable path
  #SET(EXECUTABLE_OUTPUT_PATH $ENV{HOME}/bin/$ENV{ARCHI}/)
  SET(MMG_SOURCE_DIR ${CMAKE_SOURCE_DIR}/sources/)
-@@ -140,10 +143,10 @@ IF ( LIBMMG3D4_STATIC )
+@@ -166,10 +169,10 @@ IF ( LIBMMG3D4_STATIC )
      ${source_files} ${lib_file} )
    SET_TARGET_PROPERTIES(${PROJECT_NAME}_a PROPERTIES OUTPUT_NAME ${PROJECT_NAME})
    TARGET_LINK_LIBRARIES(${PROJECT_NAME}_a ${LIBRARIES})
@@ -25,7 +25,7 @@ diff -rupN mmg3d4-4.0.1-Source/CMakeLists.txt mmg3d4-4.0.1-Source-new/CMakeLists
  ENDIF()
  
  # Compile shared library
-@@ -153,11 +156,12 @@ IF ( LIBMMG3D4_SHARED )
+@@ -179,11 +182,12 @@ IF ( LIBMMG3D4_SHARED )
      .dummy
      ${source_files} ${lib_file})
    SET_TARGET_PROPERTIES(${PROJECT_NAME}_so PROPERTIES OUTPUT_NAME ${PROJECT_NAME})
diff --git a/sources b/sources
index 4892aa9..1eca023 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3f1645d9436c330625efef298edd0ead  mmg3d4-4.0.1-Source.tar.gz
+eb971ed084276d86ef27704a1b289ea5  mmg3d4-4.0.2-Source.tar.gz


More information about the scm-commits mailing list