[rpms/netgen-mesher] f44: Pass NETGEN_VERSION_GIT to cmake

[Sandro Mani <manisandro@gmail.com>]

A new commit has been pushed.

Repo   : rpms/netgen-mesher
Branch : f44
Commit : 25d1d9d18e9728bd343847b63d910a0f77f2632c
Author : Sandro Mani <manisandro@gmail.com>
Date   : 2026-05-29T08:21:36+02:00
Stats  : +13/-26 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/netgen-mesher/c/25d1d9d18e9728bd343847b63d910a0f77f2632c?branch=f44

Log:
Pass NETGEN_VERSION_GIT to cmake

---
diff --git a/netgen-mesher.spec b/netgen-mesher.spec
index 03143ed..5efdd53 100644
--- a/netgen-mesher.spec
+++ b/netgen-mesher.spec
@@ -28,7 +28,7 @@
 Name:           netgen-mesher
 # Also update version in netgen_fallback-version.patch!
 Version:        6.2.2604
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Automatic mesh generation tool
 # FIXME https://github.com/NGSolve/netgen/issues/226
 ExcludeArch:    %{ix86} aarch64
@@ -49,15 +49,12 @@ Patch2:         0004-Make-some-includes-relative.patch
 Patch3:         0010-rename-netgen-binary.patch
 # Link against libjpeg
 Patch4:         netgen_libjpeg.patch
-# Fix fallback version
-# See https://bugzilla.redhat.com/show_bug.cgi?id=1993574#c11
-Patch5:         netgen_fallback-version.patch
 # Fix Status typedef symbol collision by re-ordering includes
 # /usr/include/mpich-x86_64/mpicxx.h:160:18: error: expected identifier before ‘int’
 #   160 |     friend class Status;
-Patch6:         netgen_include-order.patch
+Patch5:         netgen_include-order.patch
 # Fix invalid egg-info version
-Patch7:         netgen-mesher_egg-info-version.patch
+Patch6:         netgen-mesher_egg-info-version.patch
 # Port bundled togl to tk9
 # Patch8:         netgen-togl-tk9.patch
 
@@ -214,15 +211,14 @@ Python3 interface for netgen compiled against mpich.
 %prep
 %autosetup -p1 -n netgen-%{version}
 
-# Pull in minimal cmake files from NGSolv pybind11 project to make this one happy.
-# install -pm 0744 %{SOURCE99} cmake/
-# install -pm 0744 %{SOURCE100} cmake/cmake_modules/
+sed -i "s|git_version_string \"v6.2.2402\"|git_version_string "v6.2.2402"
 
 
 %build
 ### serial version ###
 %define _vpath_builddir %{_target_platform}
-%cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+%cmake -DNETGEN_VERSION_GIT=v%{version} \
+  -DCMAKE_INSTALL_PREFIX=%{_prefix} \
   -DNG_INSTALL_SUFFIX=netgen_mesher \
   -DUSE_NATIVE_ARCH=OFF \
   -DUSE_SUPERBUILD=OFF \
@@ -240,7 +236,8 @@ Python3 interface for netgen compiled against mpich.
 %define _vpath_builddir %{_target_platform}-openmpi
 %{_openmpi_load}
 export CXX=mpicxx
-%cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+%cmake -DNETGEN_VERSION_GIT=v%{version} \
+  -DCMAKE_INSTALL_PREFIX=%{_prefix} \
   -DNG_INSTALL_SUFFIX=netgen_mesher \
   -DUSE_NATIVE_ARCH=OFF \
   -DUSE_SUPERBUILD=OFF \
@@ -260,7 +257,8 @@ export CXX=mpicxx
 %define _vpath_builddir %{_target_platform}-mpich
 %{_mpich_load}
 export CXX=mpicxx
-%cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+%cmake -DNETGEN_VERSION_GIT=v%{version} \
+  -DCMAKE_INSTALL_PREFIX=%{_prefix} \
   -DNG_INSTALL_SUFFIX=netgen_mesher \
   -DUSE_NATIVE_ARCH=OFF \
   -DUSE_SUPERBUILD=OFF \
@@ -421,6 +419,9 @@ install -Dpm 0644 nglib/nglib.h %{buildroot}%{_includedir}/%{name}/nglib.h
 
 
 %changelog
+* Fri May 29 2026 Sandro Mani <manisandro@gmail.com> - 6.2.2604-2
+- Pass NETGEN_VERSION_GIT to cmake
+
 * Mon May 04 2026 Sandro Mani <manisandro@gmail.com> - 6.2.2604-1
 - Update to 6.2.2604
 

diff --git a/netgen_fallback-version.patch b/netgen_fallback-version.patch
deleted file mode 100644
index 7cae84f..0000000
--- a/netgen_fallback-version.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -rupN --no-dereference netgen-6.2.2604/cmake/generate_version_file.cmake netgen-6.2.2604-new/cmake/generate_version_file.cmake
---- netgen-6.2.2604/cmake/generate_version_file.cmake	2026-04-24 15:35:17.000000000 +0200
-+++ netgen-6.2.2604-new/cmake/generate_version_file.cmake	2026-05-04 00:19:37.937514857 +0200
-@@ -24,8 +24,8 @@ if(status AND NOT status EQUAL 0)
-       string(REGEX REPLACE "^netgen(.*)" "\\1" git_version_string "${git_version_string}")
-     endif()
-   else()
--    MESSAGE(WARNING "Could not determine git-version from source code - assuming 6.2.0-0")
--    set(git_version_string "v6.2.0-0")
-+    MESSAGE(WARNING "Could not determine git-version from source code - assuming v6.2.2402")
-+    set(git_version_string "v6.2.2402")
-   endif()
- endif()
- string(STRIP ${git_version_string} git_version_string)