[engrid] Update to latest git
Sandro Mani
smani at fedoraproject.org
Mon Mar 23 20:35:15 UTC 2015
commit fd169cd1485959acb33c8e88a1c449033030ec11
Author: Sandro Mani <manisandro at gmail.com>
Date: Mon Mar 23 21:35:06 2015 +0100
Update to latest git
.gitignore | 1 +
engrid.spec | 61 +++++++++++----------
engrid_build.patch | 154 +++++++++++++++++++----------------------------------
sources | 2 +-
4 files changed, 88 insertions(+), 130 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f28eef1..523f6f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/enGits-engrid-1.4.0-264-ge6d55f5.tar.gz
+/baef0cebdebbe59cf77aea5ecef5d92a36fac20f.tar.gz
diff --git a/engrid.spec b/engrid.spec
index 5546670..25a7434 100644
--- a/engrid.spec
+++ b/engrid.spec
@@ -1,23 +1,17 @@
-# Refer to the comment for Source0 below on how to obtain the source tarball
-# The saved file has format enGits-engrid-$version-$ahead-g$shortcommit.tar.gz
+# Until upstream starts tagging releases properly again, commits are used...
%global commit baef0cebdebbe59cf77aea5ecef5d92a36fac20f
%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global ahead 418
-
-# If ahead is 0, the tarball corresponds to a release version, otherwise to a git snapshot
-%if %{ahead} > 0
%global snap .git%{shortcommit}
-%endif
Name: engrid
-Version: 1.4.0
-Release: 6%{?snap}%{?dist}
+Version: 2.0.0
+Release: 0.1%{?snap}%{?dist}
Summary: Mesh generation tool
License: GPLv3+
URL: http://engits.eu/en/engrid
-# wget --content-disposition https://github.com/enGits/engrid/tarball/$commit
-Source0: https://github.com/enGits/engrid/tarball/%{commit}/enGits-engrid-%{version}-%{ahead}-g%{shortcommit}.tar.gz
+# wget https://github.com/enGits/engrid/tarball/$commit
+Source0: https://github.com/enGits/engrid/archive/%{commit}.tar.gz
# Taken from src/libengrid/resources/icons/G.png and resized to 64x64
Source1: engrid.png
# - Unbundle netgen
@@ -26,10 +20,12 @@ Source1: engrid.png
# - Don't link against QtNetwork
Patch0: engrid_build.patch
+BuildRequires: cmake
BuildRequires: desktop-file-utils
BuildRequires: qt-devel
BuildRequires: vtk-devel
-BuildRequires: netgen-mesher-devel
+BuildRequires: CGAL-devel
+BuildRequires: tetgen-devel
BuildRequires: netcdf-cxx-devel
BuildRequires: tex(latex)
BuildRequires: texlive-helvetic texlive-ec
@@ -64,6 +60,15 @@ development for prismatic boundary layer grids. Internally, enGrid uses the VTK
data structures as well as the *.vtu file format.
+%package devel
+Summary: Development files for enGrid
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description devel
+The %{name}-devel package contains libraries and header files for
+developing applications that use enGrid.
+
+
%package doc
Summary: Documentation and Tutorials for enGrid
BuildArch: noarch
@@ -75,10 +80,10 @@ This package contains the documentation and tutorials for enGrid.
%prep
-%autosetup -p1 -n enGits-engrid-%{shortcommit}
+%autosetup -p1 -n engrid-%{commit}
-# Unbundle netgen
-rm -rf src/ng_svn
+# Unbundle tetgen
+rm -rf src/tetgen
# Fix bad permissions
chmod -x src/libengrid/egvtkinteractorstyle.h
@@ -89,10 +94,7 @@ chmod -x src/libengrid/createvolumemesh.cpp
%build
# Build application
pushd src
-# export CXXFLAGS="$RPM_OPT_FLAGS"
-export VTKINCDIR=%{_includedir}/vtk
-export VTKLIBDIR=%{_libdir}/vtk
-%_qt4_qmake CONFIG+=netcdf
+LDFLAGS="%{__global_ldflags} -Wl,--as-needed" %cmake -DGIT_SHA1=%{commit} .
make %{?_smp_mflags}
popd
@@ -104,13 +106,10 @@ popd
%install
-# Binary
-install -Dpm 0755 src/engrid %{buildroot}%{_bindir}/engrid
+%make_install -C src
-# Shared library
-install -Dpm 755 src/libengrid/libengrid.so.1.0.0 %{buildroot}%{_libdir}/libengrid.so.1.0.0
-ln -s %{_libdir}/libengrid.so.1.0.0 %{buildroot}%{_libdir}/libengrid.so.1.0
-ln -s %{_libdir}/libengrid.so.1.0.0 %{buildroot}%{_libdir}/libengrid.so.1
+# Remove useless script
+rm %{buildroot}%{_bindir}/%{name}.bash
# Desktop file, icon
desktop-file-install \
@@ -143,21 +142,25 @@ fi
%files
-%license licence.txt
+%license licence.txt gpl.txt
%{_bindir}/engrid
%{_datadir}/applications/engrid.desktop
%{_datadir}/icons/hicolor/64x64/apps/engrid.png
-%{_libdir}/libengrid.so.*
+%{_libdir}/liblibengrid.so.*
%{_mandir}/man1/engrid.1*
+%files devel
+%{_includedir}/%{name}/
+%{_libdir}/liblibengrid.so
+
%files doc
%doc tutorials manual/manual.pdf src/blender_scripts
-%license licence.txt
+%license fdl-1.3.txt
%changelog
-* Sun Mar 22 2015 Sandro Mani <manisandro at gmail.com> - 1.4.0-6.gitbaef0ce
+* Sun Mar 22 2015 Sandro Mani <manisandro at gmail.com> - 2.0.0-0.1.gitbaef0ce
- Update to latest git
- Remove blender subpackage and ship them in -doc, they are out of date anyway
diff --git a/engrid_build.patch b/engrid_build.patch
index 386e7ad..16c65e8 100644
--- a/engrid_build.patch
+++ b/engrid_build.patch
@@ -1,111 +1,65 @@
-diff -rupN enGits-engrid-e6d55f5/src/engrid.pro enGits-engrid-e6d55f5-new/src/engrid.pro
---- enGits-engrid-e6d55f5/src/engrid.pro 2014-03-10 09:48:24.000000000 +0100
-+++ enGits-engrid-e6d55f5-new/src/engrid.pro 2014-07-30 19:09:04.584948072 +0200
-@@ -6,19 +6,10 @@ CONFIG += ordered recursive
+diff -rupN engrid-baef0cebdebbe59cf77aea5ecef5d92a36fac20f/src/CMakeLists.txt engrid-baef0cebdebbe59cf77aea5ecef5d92a36fac20f-new/src/CMakeLists.txt
+--- engrid-baef0cebdebbe59cf77aea5ecef5d92a36fac20f/src/CMakeLists.txt 2015-03-17 20:09:35.000000000 +0100
++++ engrid-baef0cebdebbe59cf77aea5ecef5d92a36fac20f-new/src/CMakeLists.txt 2015-03-23 21:01:00.789079685 +0100
+@@ -34,21 +34,10 @@ set(ENGRID_MINOR_VERSION 0)
+ set(ENGRID_PATCH_VERSION 0)
+ set(ENGRID_VERSION ${ENGRID_MAJOR_VERSION}.${ENGRID_MINOR_VERSION}.${ENGRID_PATCH_VERSION})
- CONFIG += debug_and_release
+-exec_program(
+- "git"
+- ${CMAKE_CURRENT_SOURCE_DIR}
+- ARGS "describe"
+- OUTPUT_VARIABLE GIT_SHA1)
+-string(REGEX MATCH "-g.*$" GIT_SHA1 ${GIT_SHA1})
+-string(REGEX REPLACE "[-g]" "" GIT_SHA1 ${GIT_SHA1} )
+-add_definitions( -DGIT_SHA1="${GIT_SHA1}" )
--debian {
-- SUBDIRS =
--}
--else {
-- SUBDIRS = netgen
--}
--
- SUBDIRS += libengrid
- SUBDIRS += engrid
+-exec_program(
+- "git"
+- ${CMAKE_CURRENT_SOURCE_DIR}
+- ARGS "symbolic-ref --short HEAD"
+- OUTPUT_VARIABLE GIT_BRANCH)
+-add_definitions( -DGIT_BRANCH="${GIT_BRANCH}" )
++set(GIT_SHA1 "" CACHE STRING "GIT SHA")
++add_definitions( -DGIT_SHA1="${GIT_SHA1}" )
++add_definitions( -DGIT_BRANCH="master" )
--netgen.file = netgen_svn/ng.pro
- libengrid.file = libengrid/libengrid.pro
--libengrid.depends = netgen
+ FIND_PACKAGE(VTK REQUIRED)
+ include(${VTK_USE_FILE})
+@@ -69,7 +58,6 @@ include_directories(${QT_QTGUI_INCLUDE_D
+ include_directories(${QT_QTXML_INCLUDE_DIR})
- engrid.file = engrid.pro.app
- engrid.depends = libengrid
-diff -rupN enGits-engrid-e6d55f5/src/engrid.pro.app enGits-engrid-e6d55f5-new/src/engrid.pro.app
---- enGits-engrid-e6d55f5/src/engrid.pro.app 2014-03-10 09:48:24.000000000 +0100
-+++ enGits-engrid-e6d55f5-new/src/engrid.pro.app 2014-07-30 19:10:16.358944883 +0200
-@@ -46,11 +46,12 @@ win32-msvc* {
- LIBS += ../../netCDF/lib/netcdfcxx.lib
- }
- } else {
-+ CONFIG += link_pkgconfig
- QMAKE_CXXFLAGS += -Wno-deprecated -g
- INCLUDEPATH += $(VTKINCDIR)
- LIBS += -L$(VTKLIBDIR)
-- LIBS += -L./netgen_svn -lng
- LIBS += -L./libengrid -lengrid
-+ PKGCONFIG += netgen-mesher
- brlcad {
- INCLUDEPATH += $(BRLCADINCDIR)
- INCLUDEPATH += $(BRLCADINCDIR)/openNURBS
-@@ -98,8 +99,6 @@ greaterThan(VTK_MAJOR_VERSION, 5) {
- INCLUDEPATH += ./libengrid
- INCLUDEPATH += ./libengrid-build
- INCLUDEPATH += ../engrid-build
--INCLUDEPATH += ./netgen_svn/netgen-mesher/netgen/nglib
--INCLUDEPATH += ./netgen_svn/netgen-mesher/netgen/libsrc/general
+ # set include directory, add src directories
+-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/tetgen)
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/libengrid)
+ include_directories(${CMAKE_CURRENT_BINARY_DIR}/libengrid)
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+@@ -88,7 +76,6 @@ else()
+ add_definitions(-DQT_DEBUG)
+ endif()
- OTHER_FILES += checkcomments.py todo.txt
- RESOURCES += libengrid/engrid.qrc
-diff -rupN enGits-engrid-e6d55f5/src/libengrid/libengrid.pro enGits-engrid-e6d55f5-new/src/libengrid/libengrid.pro
---- enGits-engrid-e6d55f5/src/libengrid/libengrid.pro 2014-03-10 09:48:24.000000000 +0100
-+++ enGits-engrid-e6d55f5-new/src/libengrid/libengrid.pro 2014-07-31 00:45:36.508574454 +0200
-@@ -5,7 +5,7 @@ LANGUAGE = C++
- TARGET = engrid
+-add_subdirectory(tetgen)
+ add_subdirectory(libengrid)
- CONFIG += qt debug_and_release thread
--QT += xml network opengl`
-+QT += xml opengl`
+ add_executable(engrid main.cpp)
+@@ -109,6 +96,6 @@ install(
+ DESTINATION bin
+ )
- win32-msvc* {
- CONFIG += staticlib
-@@ -46,8 +46,21 @@ win32-msvc* {
- LIBS += ../../../netCDF/lib/netcdfcxx.lib
- }
- } else {
-+ CONFIG += link_pkgconfig
- QMAKE_CXXFLAGS += -Wno-deprecated -g
- INCLUDEPATH += $(VTKINCDIR)
-+ LIBS += -L$(VTKLIBDIR)
-+ LIBS += -lvtkCommonCore
-+ LIBS += -lvtkCommonExecutionModel
-+ LIBS += -lvtkGUISupportQt
-+ LIBS += -lvtkInteractionStyle
-+ LIBS += -lvtkIOLegacy
-+ LIBS += -lvtkIOPLY
-+ LIBS += -lvtkIOXML
-+ LIBS += -lvtkRenderingAnnotation
-+ LIBS += -lvtkRenderingCore
-+ LIBS += -lvtkRenderingFreeTypeOpenGL
-+ PKGCONFIG += netgen-mesher
- brlcad {
- INCLUDEPATH += $(BRLCADINCDIR)
- INCLUDEPATH += $(BRLCADINCDIR)/openNURBS
-@@ -55,14 +68,13 @@ win32-msvc* {
- }
- netcdf {
- DEFINES += TAU_SUPPORT
-+ LIBS += -lnetcdf_c++
- }
- }
+-add_dependencies(engrid tetgen libengrid)
++add_dependencies(engrid libengrid)
- INCLUDEPATH += ..
- INCLUDEPATH += ./libengrid
--INCLUDEPATH += ../netgen_svn/netgen-mesher/netgen/nglib
--INCLUDEPATH += ../netgen_svn/netgen-mesher/netgen/libsrc/general
+diff -rupN engrid-baef0cebdebbe59cf77aea5ecef5d92a36fac20f/src/libengrid/CMakeLists.txt engrid-baef0cebdebbe59cf77aea5ecef5d92a36fac20f-new/src/libengrid/CMakeLists.txt
+--- engrid-baef0cebdebbe59cf77aea5ecef5d92a36fac20f/src/libengrid/CMakeLists.txt 2015-03-17 20:09:35.000000000 +0100
++++ engrid-baef0cebdebbe59cf77aea5ecef5d92a36fac20f-new/src/libengrid/CMakeLists.txt 2015-03-23 21:20:20.319670294 +0100
+@@ -403,7 +403,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin"
+ target_link_libraries(libengrid Qt4::QtXml)
+ endif()
- # VTK
+-target_link_libraries(libengrid ${VTK_LIBRARIES})
+-INSTALL(TARGETS libengrid LIBRARY DESTINATION lib)
++target_link_libraries(libengrid ${VTK_LIBRARIES} tet Qt4::QtXml)
++INSTALL(TARGETS libengrid LIBRARY DESTINATION lib${LIB_SUFFIX})
+ INSTALL(FILES ${libengrid_HEADERS} DESTINATION include/engrid)
-diff -rupN enGits-engrid-e6d55f5/src/misc/engrid-standard.pri enGits-engrid-e6d55f5-new/src/misc/engrid-standard.pri
---- enGits-engrid-e6d55f5/src/misc/engrid-standard.pri 2014-03-10 09:48:24.000000000 +0100
-+++ enGits-engrid-e6d55f5-new/src/misc/engrid-standard.pri 2014-07-31 00:19:33.365643915 +0200
-@@ -5,7 +5,7 @@ TARGET = engrid
- CONFIG += qt debug_and_release thread
-
- QMAKE_CXXFLAGS += -Wall
--QT += xml network opengl
-+QT += xml opengl
- QMAKE_CXXFLAGS += -Wno-deprecated
-
- LIBS += -lm
diff --git a/sources b/sources
index 5664b1f..360e3b8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-35bf9d6cf751c98f7e143c29c766423f enGits-engrid-1.4.0-264-ge6d55f5.tar.gz
+8fec548604abd79faabafa596a60a6ca baef0cebdebbe59cf77aea5ecef5d92a36fac20f.tar.gz
More information about the scm-commits
mailing list