From b70dd59d1fafc0beab1b3a6f3aaf05ab7940eb12 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Sat, 6 Jan 2024 08:05:33 +0100
Subject: [PATCH] update to 7.6.2 [release 7.6.2-1mamba;Wed Jun 01 2022]

---
 occt-7.6.2-cmake-fix2.patch    | 18 ++++++++++++++++++
 occt-7.6.2-cmake-install.patch | 13 +++++++++++++
 occt.spec                      | 23 +++++++++++++++--------
 3 files changed, 46 insertions(+), 8 deletions(-)
 create mode 100644 occt-7.6.2-cmake-fix2.patch
 create mode 100644 occt-7.6.2-cmake-install.patch

diff --git a/occt-7.6.2-cmake-fix2.patch b/occt-7.6.2-cmake-fix2.patch
new file mode 100644
index 0000000..73cfd72
--- /dev/null
+++ b/occt-7.6.2-cmake-fix2.patch
@@ -0,0 +1,18 @@
+--- occt-7.6.0/CMakeLists.txt.orig	2022-06-02 15:37:32.868338814 +0200
++++ occt-7.6.0/CMakeLists.txt	2022-06-02 15:37:42.915275211 +0200
+@@ -979,12 +979,12 @@
+ endif()
+ 
+  # change custom.bat/sh
+-if (EXISTS "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}")
+-  file (READ "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}" CUSTOM_CONTENT)
++if (EXISTS "${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}")
++  file (READ "${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}" CUSTOM_CONTENT)
+ 
+   set (CUSTOM_CONTENT "${CUSTOM_CONTENT} ${ADDITIONAL_CUSTOM_CONTENT}")
+ 
+-  file (WRITE "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}" "${CUSTOM_CONTENT}")
++  file (WRITE "${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}" "${CUSTOM_CONTENT}")
+ else()
+   OCCT_CONFIGURE_AND_INSTALL ("adm/templates/custom.${SCRIPT_EXT}.main" "custom.${SCRIPT_EXT}" "custom.${SCRIPT_EXT}" "${INSTALL_DIR_SCRIPT}")
+ endif()
diff --git a/occt-7.6.2-cmake-install.patch b/occt-7.6.2-cmake-install.patch
new file mode 100644
index 0000000..944e200
--- /dev/null
+++ b/occt-7.6.2-cmake-install.patch
@@ -0,0 +1,13 @@
+diff --git a/adm/cmake/occt_macros.cmake b/adm/cmake/occt_macros.cmake
+index 0a387945..e3f13923 100644
+--- a/adm/cmake/occt_macros.cmake
++++ b/adm/cmake/occt_macros.cmake
+@@ -592,7 +592,7 @@ macro (OCCT_UPDATE_TARGET_FILE)
+   "cmake_policy(PUSH)
+   cmake_policy(SET CMP0007 NEW)
+   string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWERCASE)
+-  file (GLOB ALL_OCCT_TARGET_FILES \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
++  file (GLOB ALL_OCCT_TARGET_FILES \"\$ENV{DESTDIR}${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
+   foreach(TARGET_FILENAME \${ALL_OCCT_TARGET_FILES})
+     file (STRINGS \"\${TARGET_FILENAME}\" TARGET_FILE_CONTENT)
+     file (REMOVE \"\${TARGET_FILENAME}\")
diff --git a/occt.spec b/occt.spec
index 8ac00c2..4010377 100644
--- a/occt.spec
+++ b/occt.spec
@@ -1,5 +1,6 @@
+%define gitver %(echo %version | tr . _)
 Name:          occt
-Version:       7.6.0
+Version:       7.6.2
 Release:       1mamba
 Summary:       Open CASCADE Technology (OCCT) full-scale 3D geometry library
 Group:         System/Libraries
@@ -7,16 +8,14 @@ Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           https://dev.opencascade.org/
-Source:        https://git.dev.opencascade.org/repos/occt.git/V%{version}/occt-%{version}.tar.bz2
+Source:        https://git.dev.opencascade.org/repos/occt.git/V%{gitver}/occt-%{version}.tar.bz2
 Patch0:        occt-7.6.0-cmake.patch
+Patch1:        occt-7.6.2-cmake-fix2.patch
+Patch2:        occt-7.6.2-cmake-install.patch
 License:       GPL
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
-BuildRequires: libICE-devel
-BuildRequires: libSM-devel
 BuildRequires: libX11-devel
-BuildRequires: libXext-devel
-BuildRequires: libXt-devel
 BuildRequires: libfontconfig-devel
 BuildRequires: libfreetype-devel
 BuildRequires: libgcc
@@ -28,6 +27,7 @@ BuildRequires: libtk-devel
 BuildRequires: libvtk-devel
 ## AUTOBUILDREQ-END
 BuildRequires: cmake
+BuildRequires: libvtk-devel >= 9.1.0-2mamba
 Requires:      lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
 Provides:      oce
 Obsoletes:     oce <= 0.17.2
@@ -63,20 +63,24 @@ This package contains libraries and header files for developing applications tha
 #-D -T
 #:<< _EOF
 %patch0 -p1 -b .cmake
+%patch1 -p1 -b .cmake-fix2
+%patch2 -p1 -b .occt-7.6.2-cmake-install.patch
 
 %build
 #:<< _EOF
 # cmake uses $ENV{DESTDIR} to create cmake_install file
 export DESTDIR=%{buildroot}
+
 %cmake -d build \
    -DCMAKE_BUILD_TYPE=RelWithDebInfo \
    -DUSE_TBB=True \
    -DUSE_VTK=True \
    -DINSTALL_VTK=False \
    -D3RDPARTY_VTK_LIBRARY_DIR=%{_libdir} \
-   -D3RDPARTY_VTK_INCLUDE_DIR=%{_includedir}/vtk-8.2 \
+   -D3RDPARTY_VTK_INCLUDE_DIR=%{_includedir}/vtk \
    -DINSTALL_DIR_LIB=%{_lib} \
-   -DINSTALL_DIR_CMAKE=%{_lib}/cmake/%{name}
+   -DINSTALL_DIR_CMAKE=%{_lib}/cmake/%{name} \
+   -Wno-dev
 
 %make
 
@@ -123,5 +127,8 @@ chmod 0755 %{buildroot}%{_bindir}/*.sh
 %doc README.txt
 
 %changelog
+* Wed Jun 01 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 7.6.2-1mamba
+- update to 7.6.2
+
 * Sun Jan 23 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 7.6.0-1mamba
 - package created using the webbuild interface