[bullet] Install all of the bullet extras (rhbz#1097452)

[rmattes]

commit 0e6d018495e95939fab8ae3668e292b144a80578
Author: Rich Mattes <richmattes at gmail.com>
Date:   Fri May 16 16:57:31 2014 -0400

    Install all of the bullet extras (rhbz#1097452)
    
    - Spec file cleanup

 bullet-2.77-extras-version.patch  |   12 ------
 bullet-2.77-lib.patch             |   24 -----------
 bullet-2.77-zero_initialize.patch |   23 -----------
 bullet.spec                       |   80 +++++++++++++++++++++----------------
 4 files changed, 45 insertions(+), 94 deletions(-)
---
diff --git a/bullet.spec b/bullet.spec
index d35f4f2..61c2fe3 100644
--- a/bullet.spec
+++ b/bullet.spec
@@ -2,7 +2,7 @@
 
 Name: bullet
 Version: 2.82
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: 3D Collision Detection and Rigid Body Dynamics Library
 Group: Development/Libraries
 License: zlib and MIT and BSD
@@ -16,8 +16,6 @@ Source0: %{name}-%{version}-r%{svnrev}-free.tar.gz
 # ./generate-tarball.sh 2.82-r2704
 Source1: generate-tarball.sh
 
-Patch0: %{name}-2.77-extras-version.patch
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: cmake
@@ -61,7 +59,6 @@ Development headers and libraries for %{name} extra libraries.
 
 %prep
 %setup -q -n %{name}-%{version}-r%{svnrev}
-%patch0 -p1 -b .extras-version
 
 # Set these files to right permission
 chmod 644 src/LinearMath/btPoolAllocator.h
@@ -76,24 +73,24 @@ rm -fr Extras/glui/*
 %build
 mkdir build
 pushd build
-%cmake -DBUILD_DEMOS=OFF -DBUILD_EXTRAS=ON -DCMAKE_BUILD_TYPE=NONE -DCMAKE_SKIP_BUILD_RPATH=ON -DINCLUDE_INSTALL_DIR=%{_includedir}/bullet ..
+%cmake .. \
+  -DBUILD_DEMOS=OFF \
+  -DBUILD_EXTRAS=ON \
+  -DINSTALL_EXTRA_LIBS=ON \
+  -DCMAKE_BUILD_TYPE=NONE \
+  -DCMAKE_SKIP_BUILD_RPATH=ON \
+  -DINCLUDE_INSTALL_DIR=%{_includedir}/bullet
+
 make %{?_smp_mflags}
 popd
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 pushd build
-#make install/fast DESTDIR=$RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-
-# install libs from Extras
-pushd Extras
-cp -a ConvexDecomposition/*so* $RPM_BUILD_ROOT%{_libdir}
-popd
-
 popd
 
+# Create symlinks for .so.X
 pushd $RPM_BUILD_ROOT%{_libdir}
 for f in lib*.so.*.*
 do
@@ -101,17 +98,10 @@ do
 done
 popd
 
-# install includes from Extras
-pushd Extras
-install -p -m 644 ConvexDecomposition/Convex*.h $RPM_BUILD_ROOT%{_includedir}/bullet
-install -p -m 644 ConvexDecomposition/vlookup.h $RPM_BUILD_ROOT%{_includedir}/bullet
-popd
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -122,35 +112,55 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files
-%defattr(-,root,root,-)
 %doc README AUTHORS COPYING NEWS ChangeLog
-%{_libdir}/*.so.*
-%exclude %{_libdir}/libConvexDecomposition.so.*
-%exclude %{_libdir}/libGLUI.so.*
+%{_libdir}/libBulletCollision.so.*
+%{_libdir}/libBulletDynamics.so.*
+%{_libdir}/libBulletSoftBody.so.*
+%{_libdir}/libLinearMath.so.*
 
 %files devel
-%defattr(-,root,root,-)
 %doc Bullet_User_Manual.pdf
-%{_includedir}/bullet
-%exclude %{_includedir}/bullet/Convex*.h
-%exclude %{_includedir}/bullet/vlookup.h
-%{_libdir}/*.so
-%exclude %{_libdir}/libConvexDecomposition.so
+%dir %{_includedir}/%{name}
+%{_includedir}/%{name}/*.h
+%{_includedir}/%{name}/BulletCollision
+%{_includedir}/%{name}/BulletDynamics
+%{_includedir}/%{name}/BulletSoftBody
+%{_includedir}/%{name}/LinearMath
+%{_includedir}/%{name}/vectormath
+%{_libdir}/libBulletCollision.so
+%{_libdir}/libBulletDynamics.so
+%{_libdir}/libBulletSoftBody.so
+%{_libdir}/libLinearMath.so
 %{_libdir}/pkgconfig/bullet.pc
 %{_libdir}/cmake/%{name}
 
 %files extras
-%defattr(-,root,root,-)
 %{_libdir}/libConvexDecomposition.so.*
+%{_libdir}/libGIMPACTUtils.so.*
+%{_libdir}/libHACD.so.*
+%{_libdir}/libBulletFileLoader.so.*
+%{_libdir}/libBulletWorldImporter.so.*
+%{_libdir}/libBulletXmlWorldImporter.so.*
 
 %files extras-devel
-%defattr(-,root,root,-)
-%{_includedir}/bullet/Convex*.h
-%{_includedir}/bullet/vlookup.h
+%{_includedir}/%{name}/ConvexDecomposition
+%{_includedir}/%{name}/GIMPACTUtils
+%{_includedir}/%{name}/HACD
+%{_includedir}/%{name}/BulletFileLoader
+%{_includedir}/%{name}/BulletWorldImporter
+%{_includedir}/%{name}/BulletXmlWorldImporter
 %{_libdir}/libConvexDecomposition.so
-
+%{_libdir}/libGIMPACTUtils.so
+%{_libdir}/libHACD.so
+%{_libdir}/libBulletFileLoader.so
+%{_libdir}/libBulletWorldImporter.so
+%{_libdir}/libBulletXmlWorldImporter.so
 
 %changelog
+* Fri May 16 2014 Rich Mattes <richmattes at gmail.com> - 2.82-2
+- Install all of the bullet extras (rhbz#1097452)
+- Spec file cleanup
+
 * Sun Feb 09 2014 Rich Mattes <richmattes at gmail.com> - 2.82-1
 - Update to version 2.82