diff --git a/.gitignore b/.gitignore index 690cfda..54ae289 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ bullet-2.75-free.tar.gz /bullet-2.80-rev2531-free.tar.gz /bullet-2.81-rev2613-free.tar.gz /bullet-2.82-r2704-free.tar.gz +/bullet3-2.83-free.tar.xz diff --git a/bullet.spec b/bullet.spec index c18a7ff..61346dd 100644 --- a/bullet.spec +++ b/bullet.spec @@ -1,14 +1,14 @@ -%global svnrev 2704 +%global _docdir_fmt %{name} Name: bullet -Version: 2.82 -Release: 7%{?dist} +Version: 2.83 +Release: 1%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library Group: Development/Libraries -License: zlib and MIT and BSD +License: zlib and MIT and BSD and Boost URL: http://www.bulletphysics.com -Source0: %{name}-%{version}-r%{svnrev}-free.tar.gz +Source0: %{name}3-%{version}-free.tar.xz # bullet contains non-free code that we cannot ship. Therefore we use # this script to remove the non-free code before shipping it. # Download the upstream tarball and invoke this script while in the @@ -16,9 +16,8 @@ Source0: %{name}-%{version}-r%{svnrev}-free.tar.gz # ./generate-tarball.sh 2.82-r2704 Source1: generate-tarball.sh -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - BuildRequires: cmake +BuildRequires: dos2unix BuildRequires: freeglut-devel BuildRequires: libICE-devel @@ -68,23 +67,18 @@ Development headers and libraries for %{name} extra libraries. %prep -%setup -q -n %{name}-%{version}-r%{svnrev} - -# Set these files to right permission -chmod 644 src/LinearMath/btPoolAllocator.h -chmod 644 src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp -chmod 644 src/BulletDynamics/ConstraintSolver/btSliderConstraint.h +%setup -q -n %{name}3-%{version} +rm -rf examples +dos2unix README.md -iconv -f ISO-8859-1 -t UTF-8 -o ChangeLog.utf8 ChangeLog -mv ChangeLog.utf8 ChangeLog -# Don't build bundled glui -rm -fr Extras/glui/* +chmod -x src/BulletDynamics/ConstraintSolver/btSliderConstraint.h +chmod -x src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp %build mkdir build pushd build %cmake .. \ - -DBUILD_DEMOS=OFF \ + -DBUILD_BULLET2_DEMOS=OFF \ -DBUILD_EXTRAS=ON \ -DINSTALL_EXTRA_LIBS=ON \ -DCMAKE_BUILD_TYPE=NONE \ @@ -94,6 +88,8 @@ pushd build make %{?_smp_mflags} popd +doxygen Doxyfile + %install rm -rf $RPM_BUILD_ROOT pushd build @@ -122,7 +118,13 @@ rm -rf $RPM_BUILD_ROOT %files -%doc README AUTHORS COPYING NEWS ChangeLog +%license LICENSE.txt +%doc README.md AUTHORS.txt VERSION +%{_libdir}/libBullet3Collision.so.* +%{_libdir}/libBullet3Common.so.* +%{_libdir}/libBullet3Dynamics.so.* +%{_libdir}/libBullet3Geometry.so.* +%{_libdir}/libBullet3OpenCL_clew.so.* %{_libdir}/libBulletCollision.so.* %{_libdir}/libBulletDynamics.so.* %{_libdir}/libBulletSoftBody.so.* @@ -131,11 +133,20 @@ rm -rf $RPM_BUILD_ROOT %files devel %dir %{_includedir}/%{name} %{_includedir}/%{name}/*.h +%{_includedir}/%{name}/Bullet3Collision +%{_includedir}/%{name}/Bullet3Common +%{_includedir}/%{name}/Bullet3Dynamics +%{_includedir}/%{name}/Bullet3Geometry +%{_includedir}/%{name}/Bullet3OpenCL %{_includedir}/%{name}/BulletCollision %{_includedir}/%{name}/BulletDynamics %{_includedir}/%{name}/BulletSoftBody %{_includedir}/%{name}/LinearMath -%{_includedir}/%{name}/vectormath +%{_libdir}/libBullet3Collision.so +%{_libdir}/libBullet3Common.so +%{_libdir}/libBullet3Dynamics.so +%{_libdir}/libBullet3Geometry.so +%{_libdir}/libBullet3OpenCL_clew.so %{_libdir}/libBulletCollision.so %{_libdir}/libBulletDynamics.so %{_libdir}/libBulletSoftBody.so @@ -144,13 +155,17 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/cmake/%{name} %files devel-doc -%doc Bullet_User_Manual.pdf +%doc docs/Bullet_User_Manual.pdf +%doc docs/BulletQuickstart.pdf +%doc docs/GPU_rigidbody_using_OpenCL.pdf +%doc html %files extras %{_libdir}/libConvexDecomposition.so.* %{_libdir}/libGIMPACTUtils.so.* %{_libdir}/libHACD.so.* %{_libdir}/libBulletFileLoader.so.* +%{_libdir}/libBullet2FileLoader.so.* %{_libdir}/libBulletWorldImporter.so.* %{_libdir}/libBulletXmlWorldImporter.so.* @@ -159,16 +174,21 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/%{name}/GIMPACTUtils %{_includedir}/%{name}/HACD %{_includedir}/%{name}/BulletFileLoader +%{_includedir}/%{name}/Bullet2FileLoader %{_includedir}/%{name}/BulletWorldImporter %{_includedir}/%{name}/BulletXmlWorldImporter %{_libdir}/libConvexDecomposition.so %{_libdir}/libGIMPACTUtils.so %{_libdir}/libHACD.so %{_libdir}/libBulletFileLoader.so +%{_libdir}/libBullet2FileLoader.so %{_libdir}/libBulletWorldImporter.so %{_libdir}/libBulletXmlWorldImporter.so %changelog +* Mon Jan 04 2016 Rich Mattes - 2.83-1 +- Update to release 2.83 + * Sat Oct 03 2015 François Cami - 2.82-7 - Move Bullet_User_Manual.pdf to a separate devel-doc package. diff --git a/generate-tarball.sh b/generate-tarball.sh index 88a6ce4..e949bc9 100644 --- a/generate-tarball.sh +++ b/generate-tarball.sh @@ -16,6 +16,7 @@ tar -xzvf $NAME-$VERSION.tgz rm -rf $NAME-$VERSION/build3/*.{bat,exe} rm -rf $NAME-$VERSION/build3/xcode* rm -rf $NAME-$VERSION/build3/*osx* +rm -rf $NAME-$VERSION/build3/premake4_* +rm -rf $NAME-$VERSION/data -tar -czvf $NAME-$VERSION-free.tar.gz $NAME-$VERSION - +tar -cJvf $NAME-$VERSION-free.tar.xz $NAME-$VERSION diff --git a/sources b/sources index 157ad3d..915c303 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0557861c6cc334228e2a8e5ac8bb1732 bullet-2.82-r2704-free.tar.gz +392430f0909a3f913f07fcdb599d4950 bullet3-2.83-free.tar.xz