rpms/bullet/F-10 bullet.spec,1.1,1.2 lib_suffix.patch,1.1,1.2

Thomas Kowaliczek linuxdonald at fedoraproject.org
Sat Oct 3 16:27:20 UTC 2009


Author: linuxdonald

Update of /cvs/pkgs/rpms/bullet/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11752

Modified Files:
	bullet.spec lib_suffix.patch 
Log Message:

Updatet to new upstream release



Index: bullet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bullet/F-10/bullet.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- bullet.spec	27 Jun 2009 22:13:12 -0000	1.1
+++ bullet.spec	3 Oct 2009 16:27:20 -0000	1.2
@@ -1,5 +1,5 @@
 Name: bullet
-Version: 2.74
+Version: 2.75
 Release: 1%{?dist}
 Summary: 3D Collision Detection and Rigid Body Dynamics Library
 Group: Development/Libraries
@@ -11,7 +11,7 @@ Source0: %{name}-%{version}-free.tar.gz
 # this script to remove the non-free code before shipping it.
 # Download the upstream tarball and invoke this script while in the
 # tarball's directory:
-# ./generate-tarball.sh 2.74
+# ./generate-tarball.sh 2.75
 Source1: generate-tarball.sh
 
 # See http://code.google.com/p/bullet/issues/detail?id=174
@@ -98,10 +98,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/BulletCollision/CollisionShapes/*.h
 %{_includedir}/BulletCollision/Gimpact/*.h
 %{_includedir}/BulletCollision/NarrowPhaseCollision/*.h
+%{_includedir}/BulletCollision/*.h
 %{_includedir}/BulletDynamics/Character/*.h
 %{_includedir}/BulletDynamics/ConstraintSolver/*.h
 %{_includedir}/BulletDynamics/Dynamics/*.h
 %{_includedir}/BulletDynamics/Vehicle/*.h
+%{_includedir}/BulletDynamics/*.h
 %{_includedir}/BulletSoftBody/*.h
 %{_includedir}/LinearMath/*.h
 %{_libdir}/*.so
@@ -109,6 +111,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 
+* Sat Oct 03 2009 Thomas Kowaliczek <linuxdonald at linuxdonald.de> - 2.75-1
+- Updatet to new upstream version 2.75
+- Updatet the patch file to work agian
+
 * Thu Jun 25 2009 Thomas Kowaliczek <linuxdonald at linuxdonald.de> - 2.74-1
 - Updatet to version 2.74
 - Updatet the patch file to work agian

lib_suffix.patch:
 BulletCollision/CMakeLists.txt |    2 +-
 BulletDynamics/CMakeLists.txt  |    2 +-
 BulletSoftBody/CMakeLists.txt  |    2 +-
 LinearMath/CMakeLists.txt      |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

Index: lib_suffix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bullet/F-10/lib_suffix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lib_suffix.patch	27 Jun 2009 22:13:12 -0000	1.1
+++ lib_suffix.patch	3 Oct 2009 16:27:20 -0000	1.2
@@ -1,44 +1,44 @@
---- ./src/BulletCollision/CMakeLists.txt	2009-02-18 23:52:03.000000000 +0100
-+++ ./src/BulletCollision/CMakeLists.txt	2009-06-24 23:54:42.899191024 +0200
-@@ -216,7 +216,7 @@
- 
- #INSTALL of other files requires CMake 2.6
- IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
--	INSTALL(TARGETS BulletCollision DESTINATION lib)
-+	INSTALL(TARGETS BulletCollision DESTINATION lib${LIB_SUFFIX})
-         INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
- ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
- 
---- ./src/BulletDynamics/CMakeLists.txt	2009-02-18 23:52:03.000000000 +0100
-+++ ./src/BulletDynamics/CMakeLists.txt	2009-06-24 23:55:00.587135244 +0200
-@@ -76,7 +76,7 @@
- ENDIF (BUILD_SHARED_LIBS)
- 
- IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
--	INSTALL(TARGETS BulletDynamics DESTINATION lib)
-+	INSTALL(TARGETS BulletDynamics DESTINATION lib${LIB_SUFFIX})
- 	INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
- ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
- 
---- ./src/BulletSoftBody/CMakeLists.txt	2009-02-18 23:52:03.000000000 +0100
-+++ ./src/BulletSoftBody/CMakeLists.txt	2009-06-24 23:54:18.388094145 +0200
-@@ -33,7 +33,7 @@
- ENDIF (BUILD_SHARED_LIBS)
- 
- IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
+--- ./src/BulletCollision/CMakeLists.txt	2009-09-17 23:33:29.000000000 +0200
++++ ./src/BulletCollision/CMakeLists.txt	2009-10-03 17:51:09.556672424 +0200
+@@ -248,7 +248,7 @@
+ 	IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+ 		INSTALL(TARGETS BulletCollision DESTINATION .)
+ 	ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+-		INSTALL(TARGETS BulletCollision DESTINATION lib)
++		INSTALL(TARGETS BulletCollision DESTINATION lib${LIB_SUFFIX})
+ 		INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
+ 		INSTALL(FILES ../btBulletCollisionCommon.h DESTINATION include/BulletCollision)
+ 	ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+--- ./src/BulletDynamics/CMakeLists.txt	2009-09-17 23:33:29.000000000 +0200
++++ ./src/BulletDynamics/CMakeLists.txt	2009-10-03 17:51:16.724672532 +0200
+@@ -89,7 +89,7 @@
+ 	IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+ 		INSTALL(TARGETS BulletDynamics DESTINATION .)
+ 	ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+-		INSTALL(TARGETS BulletDynamics DESTINATION lib)
++		INSTALL(TARGETS BulletDynamics DESTINATION lib${LIB_SUFFIX})
+ 		INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
+ 		INSTALL(FILES ../btBulletDynamicsCommon.h DESTINATION include/BulletDynamics)
+ 	ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+--- ./src/BulletSoftBody/CMakeLists.txt	2009-07-14 04:10:03.000000000 +0200
++++ ./src/BulletSoftBody/CMakeLists.txt	2009-10-03 17:51:25.189672245 +0200
+@@ -37,7 +37,7 @@
+ 	IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+ 		INSTALL(TARGETS BulletSoftBody DESTINATION .)
+ 	ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
 -	INSTALL(TARGETS BulletSoftBody DESTINATION lib)
 +	INSTALL(TARGETS BulletSoftBody DESTINATION lib${LIB_SUFFIX})
          INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
+ 	ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
  ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
- 
---- ./src/LinearMath/CMakeLists.txt	2009-02-18 23:52:03.000000000 +0100
-+++ ./src/LinearMath/CMakeLists.txt	2009-06-24 23:53:03.892114830 +0200
-@@ -41,7 +41,7 @@
- 
- #FILES_MATCHING requires CMake 2.6
- IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
+--- ./src/LinearMath/CMakeLists.txt	2009-07-14 04:10:03.000000000 +0200
++++ ./src/LinearMath/CMakeLists.txt	2009-10-03 17:51:32.196672442 +0200
+@@ -44,7 +44,7 @@
+ 	IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+ 		INSTALL(TARGETS LinearMath DESTINATION .)
+ 	ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
 -	INSTALL(TARGETS LinearMath DESTINATION lib)
 +	INSTALL(TARGETS LinearMath DESTINATION lib${LIB_SUFFIX})
  	INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
+ 	ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
  ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
- 




More information about the fedora-extras-commits mailing list