From 44f90b32076ce0b1ca9c416a95433ddd0076c4e3 Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Wed, 24 Jun 2020 07:18:34 +0200 Subject: [PATCH 01/20] "Adding package.cfg file" --- package.cfg | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 package.cfg diff --git a/package.cfg b/package.cfg new file mode 100644 index 0000000..66ea79d --- /dev/null +++ b/package.cfg @@ -0,0 +1,2 @@ +[koji] +targets = epel8 epel8-playground \ No newline at end of file From 6ff148d4742380ff535fe51608ad77e9942cc78e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 01:28:57 +0000 Subject: [PATCH 02/20] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- bullet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bullet.spec b/bullet.spec index ee5e743..0e8c9d1 100644 --- a/bullet.spec +++ b/bullet.spec @@ -2,7 +2,7 @@ Name: bullet Version: 2.87 -Release: 10%{?dist} +Release: 11%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library License: zlib and MIT and BSD and Boost URL: http://www.bulletphysics.com @@ -185,6 +185,9 @@ doxygen Doxyfile %{_libdir}/libBulletXmlWorldImporter.so %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 2.87-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sat Aug 01 2020 Fedora Release Engineering - 2.87-10 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From b39416b1892e436e258f57689032e31c703dec21 Mon Sep 17 00:00:00 2001 From: Tom spot Callaway Date: Thu, 11 Feb 2021 17:15:58 -0500 Subject: [PATCH 03/20] update to 3.08 --- .gitignore | 1 + ...ix-c++-one-definition-rule-violation.patch | 60 +++++++++++++++ bullet-3.08-tinyxml2.patch | 76 +++++++++++++++++++ bullet.spec | 25 ++++-- sources | 2 +- 5 files changed, 155 insertions(+), 9 deletions(-) create mode 100644 bullet-3.08-fix-c++-one-definition-rule-violation.patch create mode 100644 bullet-3.08-tinyxml2.patch diff --git a/.gitignore b/.gitignore index dc1f6ec..8587488 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ bullet-2.75-free.tar.gz /bullet-2.82-r2704-free.tar.gz /bullet3-2.83-free.tar.xz /bullet3-2.87-free.tar.xz +/bullet3-3.08-free.tar.xz diff --git a/bullet-3.08-fix-c++-one-definition-rule-violation.patch b/bullet-3.08-fix-c++-one-definition-rule-violation.patch new file mode 100644 index 0000000..d8cb70b --- /dev/null +++ b/bullet-3.08-fix-c++-one-definition-rule-violation.patch @@ -0,0 +1,60 @@ +diff -up bullet3-3.08/src/BulletSoftBody/btSoftMultiBodyDynamicsWorld.cpp.fix-odr bullet3-3.08/src/BulletSoftBody/btSoftMultiBodyDynamicsWorld.cpp +--- bullet3-3.08/src/BulletSoftBody/btSoftMultiBodyDynamicsWorld.cpp.fix-odr 2021-02-11 11:17:29.417618076 -0500 ++++ bullet3-3.08/src/BulletSoftBody/btSoftMultiBodyDynamicsWorld.cpp 2021-02-11 11:18:01.669770577 -0500 +@@ -177,7 +177,7 @@ void btSoftMultiBodyDynamicsWorld::debug + } + } + +-struct btSoftSingleRayCallback : public btBroadphaseRayCallback ++struct btSoftMultiBodySingleRayCallback : public btBroadphaseRayCallback + { + btVector3 m_rayFromWorld; + btVector3 m_rayToWorld; +@@ -188,7 +188,7 @@ struct btSoftSingleRayCallback : public + const btSoftMultiBodyDynamicsWorld* m_world; + btCollisionWorld::RayResultCallback& m_resultCallback; + +- btSoftSingleRayCallback(const btVector3& rayFromWorld, const btVector3& rayToWorld, const btSoftMultiBodyDynamicsWorld* world, btCollisionWorld::RayResultCallback& resultCallback) ++ btSoftMultiBodySingleRayCallback(const btVector3& rayFromWorld, const btVector3& rayToWorld, const btSoftMultiBodyDynamicsWorld* world, btCollisionWorld::RayResultCallback& resultCallback) + : m_rayFromWorld(rayFromWorld), + m_rayToWorld(rayToWorld), + m_world(world), +@@ -256,7 +256,7 @@ void btSoftMultiBodyDynamicsWorld::rayTe + BT_PROFILE("rayTest"); + /// use the broadphase to accelerate the search for objects, based on their aabb + /// and for each object with ray-aabb overlap, perform an exact ray test +- btSoftSingleRayCallback rayCB(rayFromWorld, rayToWorld, this, resultCallback); ++ btSoftMultiBodySingleRayCallback rayCB(rayFromWorld, rayToWorld, this, resultCallback); + + #ifndef USE_BRUTEFORCE_RAYBROADPHASE + m_broadphasePairCache->rayTest(rayFromWorld, rayToWorld, rayCB); +diff -up bullet3-3.08/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp.fix-odr bullet3-3.08/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp +--- bullet3-3.08/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp.fix-odr 2021-02-11 11:16:19.157285864 -0500 ++++ bullet3-3.08/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp 2021-02-11 11:16:44.220404370 -0500 +@@ -172,7 +172,7 @@ void btSoftRigidDynamicsWorld::debugDraw + } + } + +-struct btSoftSingleRayCallback : public btBroadphaseRayCallback ++struct btSoftRigidSingleRayCallback : public btBroadphaseRayCallback + { + btVector3 m_rayFromWorld; + btVector3 m_rayToWorld; +@@ -183,7 +183,7 @@ struct btSoftSingleRayCallback : public + const btSoftRigidDynamicsWorld* m_world; + btCollisionWorld::RayResultCallback& m_resultCallback; + +- btSoftSingleRayCallback(const btVector3& rayFromWorld, const btVector3& rayToWorld, const btSoftRigidDynamicsWorld* world, btCollisionWorld::RayResultCallback& resultCallback) ++ btSoftRigidSingleRayCallback(const btVector3& rayFromWorld, const btVector3& rayToWorld, const btSoftRigidDynamicsWorld* world, btCollisionWorld::RayResultCallback& resultCallback) + : m_rayFromWorld(rayFromWorld), + m_rayToWorld(rayToWorld), + m_world(world), +@@ -251,7 +251,7 @@ void btSoftRigidDynamicsWorld::rayTest(c + BT_PROFILE("rayTest"); + /// use the broadphase to accelerate the search for objects, based on their aabb + /// and for each object with ray-aabb overlap, perform an exact ray test +- btSoftSingleRayCallback rayCB(rayFromWorld, rayToWorld, this, resultCallback); ++ btSoftRigidSingleRayCallback rayCB(rayFromWorld, rayToWorld, this, resultCallback); + + #ifndef USE_BRUTEFORCE_RAYBROADPHASE + m_broadphasePairCache->rayTest(rayFromWorld, rayToWorld, rayCB); diff --git a/bullet-3.08-tinyxml2.patch b/bullet-3.08-tinyxml2.patch new file mode 100644 index 0000000..0bbf7b5 --- /dev/null +++ b/bullet-3.08-tinyxml2.patch @@ -0,0 +1,76 @@ +diff -up bullet3-3.08/CMakeLists.txt.tinyxml bullet3-3.08/CMakeLists.txt +--- bullet3-3.08/CMakeLists.txt.tinyxml 2020-12-22 20:29:33.000000000 -0500 ++++ bullet3-3.08/CMakeLists.txt 2021-02-11 10:42:15.135608499 -0500 +@@ -349,6 +349,8 @@ ENDIF(BUILD_PYBULLET) + OPTION(BUILD_ENET "Set when you want to build apps with enet UDP networking support" ON) + OPTION(BUILD_CLSOCKET "Set when you want to build apps with enet TCP networking support" ON) + ++include(FindPkgConfig) ++pkg_check_modules(tinyxml2 REQUIRED tinyxml2) + + IF(BUILD_PYBULLET) + FIND_PACKAGE(PythonLibs) +diff -up bullet3-3.08/Extras/BulletRobotics/CMakeLists.txt.tinyxml bullet3-3.08/Extras/BulletRobotics/CMakeLists.txt +--- bullet3-3.08/Extras/BulletRobotics/CMakeLists.txt.tinyxml 2021-02-11 10:42:15.136608503 -0500 ++++ bullet3-3.08/Extras/BulletRobotics/CMakeLists.txt 2021-02-11 10:46:27.929805933 -0500 +@@ -1,5 +1,6 @@ + + INCLUDE_DIRECTORIES( ++ ${tinyxml2_INCLUDE_DIRS} + ${BULLET_PHYSICS_SOURCE_DIR}/src + ${BULLET_PHYSICS_SOURCE_DIR}/examples + ${BULLET_PHYSICS_SOURCE_DIR}/examples/SharedMemory +@@ -60,7 +61,6 @@ SET(BulletRobotics_INCLUDES + ../../examples/Utils/b3ERPCFMHelper.hpp + ../../examples/Utils/b3ReferenceFrameHelper.hpp + +- ../../examples/ThirdPartyLibs/tinyxml2/tinyxml2.h + ../../examples/ThirdPartyLibs/Wavefront/tiny_obj_loader.h + ../../examples/ThirdPartyLibs/stb_image/stb_image.h + ../../examples/ThirdPartyLibs/BussIK/Jacobian.h +@@ -129,7 +129,6 @@ SET(BulletRobotics_SRCS ${BulletRobotics + ../../examples/Utils/b3ResourcePath.cpp + ../../examples/Utils/ChromeTraceUtil.cpp + +- ../../examples/ThirdPartyLibs/tinyxml2/tinyxml2.cpp + ../../examples/ThirdPartyLibs/Wavefront/tiny_obj_loader.cpp + ../../examples/ThirdPartyLibs/stb_image/stb_image.cpp + ../../examples/ThirdPartyLibs/BussIK/Jacobian.cpp +@@ -245,7 +244,7 @@ SET_TARGET_PROPERTIES(BulletRobotics PRO + SET_TARGET_PROPERTIES(BulletRobotics PROPERTIES SOVERSION ${BULLET_VERSION}) + + IF (BUILD_SHARED_LIBS) +- TARGET_LINK_LIBRARIES(BulletRobotics BulletInverseDynamicsUtils BulletWorldImporter BulletFileLoader BulletSoftBody BulletDynamics BulletCollision BulletInverseDynamics LinearMath Bullet3Common) ++ TARGET_LINK_LIBRARIES(BulletRobotics BulletInverseDynamicsUtils BulletWorldImporter BulletFileLoader BulletSoftBody BulletDynamics BulletCollision BulletInverseDynamics LinearMath Bullet3Common ${tinyxml2_LIBRARIES}) + ENDIF (BUILD_SHARED_LIBS) + + +diff -up bullet3-3.08/Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt.tinyxml bullet3-3.08/Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt +--- bullet3-3.08/Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt.tinyxml 2020-12-22 20:29:33.000000000 -0500 ++++ bullet3-3.08/Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt 2021-02-11 10:47:36.997133090 -0500 +@@ -1,8 +1,8 @@ + INCLUDE_DIRECTORIES( ++ ${tinyxml2_INCLUDE_DIRS} + ${BULLET_PHYSICS_SOURCE_DIR}/src + ${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletFileLoader + ${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletWorldImporter +- ${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/tinyxml2 + ) + + ADD_LIBRARY( +@@ -11,14 +11,13 @@ ADD_LIBRARY( + btBulletXmlWorldImporter.h + string_split.cpp + string_split.h +- ${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/tinyxml2/tinyxml2.cpp + ) + + SET_TARGET_PROPERTIES(BulletXmlWorldImporter PROPERTIES VERSION ${BULLET_VERSION}) + SET_TARGET_PROPERTIES(BulletXmlWorldImporter PROPERTIES SOVERSION ${BULLET_VERSION}) + + IF (BUILD_SHARED_LIBS) +- TARGET_LINK_LIBRARIES(BulletXmlWorldImporter BulletWorldImporter BulletDynamics BulletCollision BulletFileLoader LinearMath) ++ TARGET_LINK_LIBRARIES(BulletXmlWorldImporter BulletWorldImporter BulletDynamics BulletCollision BulletFileLoader LinearMath ${tinyxml2_LIBRARIES}) + ENDIF (BUILD_SHARED_LIBS) + + IF (INSTALL_EXTRA_LIBS) diff --git a/bullet.spec b/bullet.spec index 0e8c9d1..d893857 100644 --- a/bullet.spec +++ b/bullet.spec @@ -1,8 +1,8 @@ %global _docdir_fmt %{name} Name: bullet -Version: 2.87 -Release: 11%{?dist} +Version: 3.08 +Release: 1%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library License: zlib and MIT and BSD and Boost URL: http://www.bulletphysics.com @@ -16,7 +16,10 @@ Source0: %{name}3-%{version}-free.tar.xz Source1: generate-tarball.sh # Build against system tinyxml -Patch0: %{name}-2.87-tinyxml.patch +Patch0: %{name}-3.08-tinyxml2.patch + +# Fix C++ One Definition Rule violation +Patch1: %{name}-3.08-fix-c++-one-definition-rule-violation.patch BuildRequires: gcc BuildRequires: gcc-c++ @@ -25,7 +28,8 @@ BuildRequires: dos2unix BuildRequires: doxygen BuildRequires: freeglut-devel BuildRequires: libICE-devel -BuildRequires: tinyxml-devel +BuildRequires: tinyxml2-devel +BuildRequires: libglvnd-devel %description Bullet is a 3D Collision Detection and Rigid Body Dynamics Library for games @@ -69,15 +73,16 @@ Development headers and libraries for %{name} extra libraries. %prep %setup -q -n %{name}3-%{version} -%patch0 -p0 -b .tinyxml +%patch0 -p1 -b .tinyxml +%patch1 -p1 -b .fix-odr # The examples directory isn't needed for building rm -r examples # Fix the pkg-config module so it doesn't list the prefix twice in the include install dir. -sed -i 's|-I@CMAKE_INSTALL_PREFIX@/@INCLUDE_INSTALL_DIR@|-I@INCLUDE_INSTALL_DIR@|' bullet.pc.cmake +sed -i 's|${prefix}/@INCLUDE_INSTALL_DIR@|@INCLUDE_INSTALL_DIR@|' bullet.pc.cmake -# BulletRobotics and obj2sdf require several bundled libs not yet packaged in the distribution -sed -i 's|BulletRobotics||' Extras/CMakeLists.txt +# BulletRobotics, BulletRoboticsGUI and obj2sdf require several bundled libs not yet packaged in the distribution +sed -i 's|BulletRoboticsGUI BulletRobotics||' Extras/CMakeLists.txt sed -i 's|obj2sdf||' Extras/CMakeLists.txt # Fix up file permissions and formats @@ -95,6 +100,7 @@ chmod -x src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp -DBUILD_UNIT_TESTS=OFF \ -DINSTALL_EXTRA_LIBS=ON \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DOpenGL_GL_PREFERENCE=GLVND \ -DINCLUDE_INSTALL_DIR=%{_includedir}/bullet/ %cmake_build @@ -185,6 +191,9 @@ doxygen Doxyfile %{_libdir}/libBulletXmlWorldImporter.so %changelog +* Thu Feb 11 2021 Tom Callaway - 3.08-1 +- update to 3.08 + * Tue Jan 26 2021 Fedora Release Engineering - 2.87-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 0719e2b..e4abbb6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (bullet3-2.87-free.tar.xz) = 391fd2cdfe0932f4bf7e78555d56c2de5c5051cc251d3a3c7d72d942a3f764330295ae207cf670294157fe9508e8a667faf6b75099a282f8c2e2757f01c56b47 +SHA512 (bullet3-3.08-free.tar.xz) = 33f4b187a643e046eda6c2b5dd7ae77743000802105b5ec4324883c5e148917809dfd819dd7b0b6687e03a114a5a66e3ef876e423d58e9f4b7101b550942de33 From 8418ab8725e82d1bb9fff509117350045494a509 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 14:00:41 +0000 Subject: [PATCH 04/20] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 7eb28c407b7f3bf3c2956e1c9d568e0f1e9842d7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 18:58:03 +0000 Subject: [PATCH 05/20] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- bullet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bullet.spec b/bullet.spec index d893857..fb05591 100644 --- a/bullet.spec +++ b/bullet.spec @@ -2,7 +2,7 @@ Name: bullet Version: 3.08 -Release: 1%{?dist} +Release: 2%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library License: zlib and MIT and BSD and Boost URL: http://www.bulletphysics.com @@ -191,6 +191,9 @@ doxygen Doxyfile %{_libdir}/libBulletXmlWorldImporter.so %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 3.08-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Feb 11 2021 Tom Callaway - 3.08-1 - update to 3.08 From f859c2aba22dcfa1dd563eb39c145b781fc94c95 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 22:41:51 +0000 Subject: [PATCH 06/20] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- bullet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bullet.spec b/bullet.spec index fb05591..7d638a0 100644 --- a/bullet.spec +++ b/bullet.spec @@ -2,7 +2,7 @@ Name: bullet Version: 3.08 -Release: 2%{?dist} +Release: 3%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library License: zlib and MIT and BSD and Boost URL: http://www.bulletphysics.com @@ -191,6 +191,9 @@ doxygen Doxyfile %{_libdir}/libBulletXmlWorldImporter.so %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 3.08-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jul 21 2021 Fedora Release Engineering - 3.08-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 12afcc840e474241aeaba5273007fc34919710d0 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Fri, 28 Jan 2022 08:18:07 -0800 Subject: [PATCH 07/20] Remove package.cfg; Part of epel8-playground decommission --- package.cfg | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 package.cfg diff --git a/package.cfg b/package.cfg deleted file mode 100644 index 66ea79d..0000000 --- a/package.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[koji] -targets = epel8 epel8-playground \ No newline at end of file From f577fee31354f70ca1b5a7098650ef513bccb0a8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 22:22:30 +0000 Subject: [PATCH 08/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- bullet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bullet.spec b/bullet.spec index 7d638a0..a013c95 100644 --- a/bullet.spec +++ b/bullet.spec @@ -2,7 +2,7 @@ Name: bullet Version: 3.08 -Release: 3%{?dist} +Release: 4%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library License: zlib and MIT and BSD and Boost URL: http://www.bulletphysics.com @@ -191,6 +191,9 @@ doxygen Doxyfile %{_libdir}/libBulletXmlWorldImporter.so %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 3.08-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jan 19 2022 Fedora Release Engineering - 3.08-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From a3e839990a7d3d4ce8320cd6e82b674f2f5a1e36 Mon Sep 17 00:00:00 2001 From: Rich Mattes Date: Sun, 25 Sep 2022 14:41:01 -0400 Subject: [PATCH 09/20] Rebuild for tinyxml2-9.0.0 --- bullet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bullet.spec b/bullet.spec index a013c95..ab0d497 100644 --- a/bullet.spec +++ b/bullet.spec @@ -2,7 +2,7 @@ Name: bullet Version: 3.08 -Release: 4%{?dist} +Release: 5%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library License: zlib and MIT and BSD and Boost URL: http://www.bulletphysics.com @@ -191,6 +191,9 @@ doxygen Doxyfile %{_libdir}/libBulletXmlWorldImporter.so %changelog +* Sun Sep 25 2022 Rich Mattes - 3.08-5 +- Rebuild for tinyxml2-9.0.0 + * Wed Jul 20 2022 Fedora Release Engineering - 3.08-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From bd531bce5086f328ab29a9f50870200b699d396e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 23:17:16 +0000 Subject: [PATCH 10/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- bullet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bullet.spec b/bullet.spec index ab0d497..daf68fa 100644 --- a/bullet.spec +++ b/bullet.spec @@ -2,7 +2,7 @@ Name: bullet Version: 3.08 -Release: 5%{?dist} +Release: 6%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library License: zlib and MIT and BSD and Boost URL: http://www.bulletphysics.com @@ -191,6 +191,9 @@ doxygen Doxyfile %{_libdir}/libBulletXmlWorldImporter.so %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 3.08-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sun Sep 25 2022 Rich Mattes - 3.08-5 - Rebuild for tinyxml2-9.0.0 From 625ca9cf6ac26bdbeddb518f2dd66adeb99a8e34 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 15:04:26 +0000 Subject: [PATCH 11/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- bullet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bullet.spec b/bullet.spec index daf68fa..d7e141d 100644 --- a/bullet.spec +++ b/bullet.spec @@ -2,7 +2,7 @@ Name: bullet Version: 3.08 -Release: 6%{?dist} +Release: 7%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library License: zlib and MIT and BSD and Boost URL: http://www.bulletphysics.com @@ -191,6 +191,9 @@ doxygen Doxyfile %{_libdir}/libBulletXmlWorldImporter.so %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 3.08-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Jan 18 2023 Fedora Release Engineering - 3.08-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From a4ac8fb3e1f11ce5fd7b6360ea3decf39133f9cb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 14:49:42 +0000 Subject: [PATCH 12/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- bullet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bullet.spec b/bullet.spec index d7e141d..3808a95 100644 --- a/bullet.spec +++ b/bullet.spec @@ -2,7 +2,7 @@ Name: bullet Version: 3.08 -Release: 7%{?dist} +Release: 8%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library License: zlib and MIT and BSD and Boost URL: http://www.bulletphysics.com @@ -191,6 +191,9 @@ doxygen Doxyfile %{_libdir}/libBulletXmlWorldImporter.so %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 3.08-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 3.08-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 248f72deca4c1582609b186841b7c195f6fc0053 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 23 Jan 2024 00:57:22 +0000 Subject: [PATCH 13/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- bullet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bullet.spec b/bullet.spec index 3808a95..337eece 100644 --- a/bullet.spec +++ b/bullet.spec @@ -2,7 +2,7 @@ Name: bullet Version: 3.08 -Release: 8%{?dist} +Release: 9%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library License: zlib and MIT and BSD and Boost URL: http://www.bulletphysics.com @@ -191,6 +191,9 @@ doxygen Doxyfile %{_libdir}/libBulletXmlWorldImporter.so %changelog +* Tue Jan 23 2024 Fedora Release Engineering - 3.08-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 3.08-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From b191b4fddcb700df4021b8fd7523e6db50944608 Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:46 +0200 Subject: [PATCH 14/20] Eliminate use of obsolete %patchN syntax (#2283636) --- bullet.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bullet.spec b/bullet.spec index 337eece..cdfd43d 100644 --- a/bullet.spec +++ b/bullet.spec @@ -73,8 +73,8 @@ Development headers and libraries for %{name} extra libraries. %prep %setup -q -n %{name}3-%{version} -%patch0 -p1 -b .tinyxml -%patch1 -p1 -b .fix-odr +%patch -P0 -p1 -b .tinyxml +%patch -P1 -p1 -b .fix-odr # The examples directory isn't needed for building rm -r examples From 954c753771ad6fbf2d9055725387dc55588fda5f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 18:43:37 +0000 Subject: [PATCH 15/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- bullet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bullet.spec b/bullet.spec index cdfd43d..84d993c 100644 --- a/bullet.spec +++ b/bullet.spec @@ -2,7 +2,7 @@ Name: bullet Version: 3.08 -Release: 9%{?dist} +Release: 10%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library License: zlib and MIT and BSD and Boost URL: http://www.bulletphysics.com @@ -191,6 +191,9 @@ doxygen Doxyfile %{_libdir}/libBulletXmlWorldImporter.so %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 3.08-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Jan 23 2024 Fedora Release Engineering - 3.08-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 12e661ee7ced9952c39b15995ebfd54c4e96633a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 28 Aug 2024 08:20:44 +0200 Subject: [PATCH 16/20] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- bullet.spec | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/bullet.spec b/bullet.spec index 84d993c..6276d53 100644 --- a/bullet.spec +++ b/bullet.spec @@ -2,9 +2,10 @@ Name: bullet Version: 3.08 -Release: 10%{?dist} +Release: 11%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library -License: zlib and MIT and BSD and Boost +# Automatically converted from old format: zlib and MIT and BSD and Boost - review is highly recommended. +License: Zlib AND LicenseRef-Callaway-MIT AND LicenseRef-Callaway-BSD AND BSL-1.0 URL: http://www.bulletphysics.com Source0: %{name}3-%{version}-free.tar.xz @@ -46,7 +47,8 @@ Development headers and libraries for %{name}. %package devel-doc Summary: Documentation for developing programs that will use %{name}-devel -License: zlib and LGPLv2+ +# Automatically converted from old format: zlib and LGPLv2+ - review is highly recommended. +License: Zlib AND LicenseRef-Callaway-LGPLv2+ Requires: %{name}-extras%{?_isa} = %{version}-%{release} %description devel-doc @@ -55,7 +57,8 @@ Documentation (PDF) for developing programs that will use %{name}-devel. %package extras Summary: Extra libraries for %{name} -License: zlib and LGPLv2+ +# Automatically converted from old format: zlib and LGPLv2+ - review is highly recommended. +License: Zlib AND LicenseRef-Callaway-LGPLv2+ %description extras Extra libraries for %{name}. @@ -63,7 +66,8 @@ Extra libraries for %{name}. %package extras-devel Summary: Development files for %{name} extras -License: zlib and LGPLv2+ +# Automatically converted from old format: zlib and LGPLv2+ - review is highly recommended. +License: Zlib AND LicenseRef-Callaway-LGPLv2+ Requires: %{name}-extras%{?_isa} = %{version}-%{release} Requires: %{name}-devel%{?_isa} = %{version}-%{release} @@ -191,6 +195,9 @@ doxygen Doxyfile %{_libdir}/libBulletXmlWorldImporter.so %changelog +* Wed Aug 28 2024 Miroslav Suchý - 3.08-11 +- convert license to SPDX + * Wed Jul 17 2024 Fedora Release Engineering - 3.08-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 463db811f83b4c71b9529b852e2eac2145ddb662 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Tue, 12 Nov 2024 00:51:45 +0000 Subject: [PATCH 17/20] rebuilt for tinyxml2 rebuilt for tinyxml2 rebuilt for tinyxml2 rebuilt for tinyxml2 rebuilt for tinyxml2 --- bullet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bullet.spec b/bullet.spec index 6276d53..b1cfbae 100644 --- a/bullet.spec +++ b/bullet.spec @@ -2,7 +2,7 @@ Name: bullet Version: 3.08 -Release: 11%{?dist} +Release: 12%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library # Automatically converted from old format: zlib and MIT and BSD and Boost - review is highly recommended. License: Zlib AND LicenseRef-Callaway-MIT AND LicenseRef-Callaway-BSD AND BSL-1.0 @@ -195,6 +195,9 @@ doxygen Doxyfile %{_libdir}/libBulletXmlWorldImporter.so %changelog +* Tue Nov 12 2024 Dominik Mierzejewski - 3.08-12 +- rebuilt for tinyxml2 + * Wed Aug 28 2024 Miroslav Suchý - 3.08-11 - convert license to SPDX From 67c868aa93a5f19bf37ee90f70c4dd8b1d3e87ba Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 13:02:22 +0000 Subject: [PATCH 18/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- bullet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bullet.spec b/bullet.spec index b1cfbae..dd1801d 100644 --- a/bullet.spec +++ b/bullet.spec @@ -2,7 +2,7 @@ Name: bullet Version: 3.08 -Release: 12%{?dist} +Release: 13%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library # Automatically converted from old format: zlib and MIT and BSD and Boost - review is highly recommended. License: Zlib AND LicenseRef-Callaway-MIT AND LicenseRef-Callaway-BSD AND BSL-1.0 @@ -195,6 +195,9 @@ doxygen Doxyfile %{_libdir}/libBulletXmlWorldImporter.so %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 3.08-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Tue Nov 12 2024 Dominik Mierzejewski - 3.08-12 - rebuilt for tinyxml2 From 5a38dbcbd4f90c31f7303dc01320dae4fb8f4360 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 17:57:44 +0000 Subject: [PATCH 19/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- bullet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bullet.spec b/bullet.spec index dd1801d..802bc1c 100644 --- a/bullet.spec +++ b/bullet.spec @@ -2,7 +2,7 @@ Name: bullet Version: 3.08 -Release: 13%{?dist} +Release: 14%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library # Automatically converted from old format: zlib and MIT and BSD and Boost - review is highly recommended. License: Zlib AND LicenseRef-Callaway-MIT AND LicenseRef-Callaway-BSD AND BSL-1.0 @@ -195,6 +195,9 @@ doxygen Doxyfile %{_libdir}/libBulletXmlWorldImporter.so %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 3.08-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jan 16 2025 Fedora Release Engineering - 3.08-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 7a4e0699ae856610860271a6c3155969d48f40e2 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sat, 23 Aug 2025 06:59:01 -0400 Subject: [PATCH 20/20] Rebuilt for tinyxml2 11.0.0 --- bullet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bullet.spec b/bullet.spec index 802bc1c..5a26dee 100644 --- a/bullet.spec +++ b/bullet.spec @@ -2,7 +2,7 @@ Name: bullet Version: 3.08 -Release: 14%{?dist} +Release: 15%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library # Automatically converted from old format: zlib and MIT and BSD and Boost - review is highly recommended. License: Zlib AND LicenseRef-Callaway-MIT AND LicenseRef-Callaway-BSD AND BSL-1.0 @@ -195,6 +195,9 @@ doxygen Doxyfile %{_libdir}/libBulletXmlWorldImporter.so %changelog +* Sat Aug 23 2025 Benjamin A. Beasley - 3.08-15 +- Rebuilt for tinyxml2 11.0.0 + * Wed Jul 23 2025 Fedora Release Engineering - 3.08-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild