From 1d4db4b70bd5b662e68cbefb4b82f4d656516f0d Mon Sep 17 00:00:00 2001
From: Funda Wang <fundawang@yeah.net>
Date: Fri, 22 Aug 2025 10:05:15 +0800
Subject: [PATCH] deal with upcoming LIB_SUFFIX removal

---
 bullet.spec                            | 20 ++++++++++++++++----
 bullet3-2.87-deal-with-libsuffix.patch | 14 ++++++++++++++
 2 files changed, 30 insertions(+), 4 deletions(-)
 create mode 100644 bullet3-2.87-deal-with-libsuffix.patch

diff --git a/bullet.spec b/bullet.spec
index 76d925d..2cd3ce7 100644
--- a/bullet.spec
+++ b/bullet.spec
@@ -2,12 +2,13 @@
 
 Name:           bullet
 Version:        2.87
-Release:        8
+Release:        9
 Summary:        Real-time collision detection and multi-physics simulation
 License:        zlib and MIT and BSD and Boost and LGPLv2+
 URL:            http://www.bulletphysics.com
 Source0:        https://github.com/bulletphysics/bullet3/archive/%{version}.tar.gz
 Patch0:         bullet3-2.87-port-to-newer-cmake.patch
+Patch1:         bullet3-2.87-deal-with-libsuffix.patch
 BuildRequires:  gcc-c++ cmake dos2unix doxygen freeglut-devel libICE-devel tinyxml-devel
 Provides:       bullet-extras = %{version}-%{release}
 Obsoletes:      bullet-extras < %{version}-%{release}
@@ -46,9 +47,17 @@ dos2unix README.md
 chmod -x src/BulletDynamics/ConstraintSolver/{btSliderConstraint.h,btSliderConstraint.cpp}
 
 %build
-%cmake -DCLSOCKET_DEP_ONLY=ON -DBUILD_BULLET2_DEMOS=OFF -DBUILD_EXTRAS=ON -DBUILD_OPENGL_DEMOS=OFF \
-          -DBUILD_CPU_DEMOS=OFF -DBUILD_UNIT_TESTS=OFF -DINSTALL_EXTRA_LIBS=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-          -DINCLUDE_INSTALL_DIR=%{_includedir}/bullet/
+%cmake \
+    -DCLSOCKET_DEP_ONLY=ON \
+    -DBUILD_BULLET2_DEMOS=OFF \
+    -DBUILD_EXTRAS=ON \
+    -DBUILD_OPENGL_DEMOS=OFF \
+    -DBUILD_CPU_DEMOS=OFF \
+    -DBUILD_UNIT_TESTS=OFF \
+    -DINSTALL_EXTRA_LIBS=ON \
+    -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+    -DINCLUDE_INSTALL_DIR=%{_includedir}/bullet/ \
+%{nil}
 %cmake_build
 doxygen Doxyfile
 
@@ -72,6 +81,9 @@ doxygen Doxyfile
 %doc docs/Bullet_User_Manual.pdf docs/BulletQuickstart.pdf docs/GPU_rigidbody_using_OpenCL.pdf html
 
 %changelog
+* Fri Aug 22 2025 Funda Wang <fundawang@yeah.net> - 2.87-9
+- deal with upcoming LIB_SUFFIX removal
+
 * Sun Mar 02 2025 Funda Wang <fundawang@yeah.net> - 2.87-8
 - try build with cmake 4.0
 
diff --git a/bullet3-2.87-deal-with-libsuffix.patch b/bullet3-2.87-deal-with-libsuffix.patch
new file mode 100644
index 0000000..d6e8ffa
--- /dev/null
+++ b/bullet3-2.87-deal-with-libsuffix.patch
@@ -0,0 +1,14 @@
+--- bullet3-2.87/CMakeLists.txt.orig	2025-08-22 09:32:28.947146100 +0800
++++ bullet3-2.87/CMakeLists.txt	2025-08-22 09:41:47.989368400 +0800
+@@ -432,6 +432,11 @@
+ 	ENDIF(BUILD_EXTRAS)
+ 
+ 	SET (LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
++
++	include(GNUInstallDirs)
++	IF("${LIB_SUFFIX}" STREQUAL "" AND NOT ${CMAKE_INSTALL_LIBDIR} STREQUAL "lib")
++		STRING(REPLACE "lib" "" LIB_SUFFIX ${CMAKE_INSTALL_LIBDIR})
++	ENDIF("${LIB_SUFFIX}" STREQUAL "" AND NOT ${CMAKE_INSTALL_LIBDIR} STREQUAL "lib")
+ 	SET (LIB_DESTINATION "lib${LIB_SUFFIX}" CACHE STRING "Library directory name")
+ 	## the following are directories where stuff will be installed to
+ 	SET(INCLUDE_INSTALL_DIR "include/bullet/" CACHE PATH "The subdirectory to the header prefix")
-- 
Gitee