rpms/bullet/F-11 bullet-2.75-cmake_pkgconfig.patch, NONE, 1.1 bullet.pc.cmake, NONE, 1.1 bullet.spec, 1.2, 1.3

[Thomas Kowaliczek]

Author: linuxdonald

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

Modified Files:
	bullet.spec 
Added Files:
	bullet-2.75-cmake_pkgconfig.patch bullet.pc.cmake 
Log Message:
fixed 549051 thanks for ths goes to  Rex Dieter

bullet-2.75-cmake_pkgconfig.patch:
 CMakeLists.txt |   16 ++++++++++++++++
 1 file changed, 16 insertions(+)

--- NEW FILE bullet-2.75-cmake_pkgconfig.patch ---
diff -up bullet-2.75/CMakeLists.txt.pkgconfig bullet-2.75/CMakeLists.txt
--- bullet-2.75/CMakeLists.txt.pkgconfig	2009-09-11 14:21:29.000000000 -0500
+++ bullet-2.75/CMakeLists.txt	2010-03-09 17:23:00.937193505 -0600
@@ -70,3 +70,19 @@ IF(BUILD_EXTRAS)
 ENDIF(BUILD_EXTRAS)
 
 SUBDIRS(src)
+
+set (LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
+set (LIB_DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE STRING "Library directory name")
+## the following are directories where stuff will be installed to
+set(INCLUDE_INSTALL_DIR      "${CMAKE_INSTALL_PREFIX}/include/" CACHE PATH "The subdirectory to the header prefix")
+set(PKGCONFIG_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig/" CACHE STRING "Base directory for pkgconfig files")
+
+if(NOT WIN32)
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/bullet.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/bullet.pc @ONLY)
+  install(
+    FILES
+    ${CMAKE_CURRENT_BINARY_DIR}/bullet.pc
+    DESTINATION
+    ${PKGCONFIG_INSTALL_PREFIX})
+endif(NOT WIN32)
+


--- NEW FILE bullet.pc.cmake ---
Name: bullet
Description: Bullet Continuous Collision Detection and Physics Library
Requires:
Version: @BULLET_VERSION@
Libs: -L at LIB_DESTINATION@ -lbulletdynamics -lbulletcollision -lbulletmath
Cflags: -I at INCLUDE_INSTALL_DIR@/bullet


Index: bullet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bullet/F-11/bullet.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- bullet.spec	3 Oct 2009 16:28:04 -0000	1.2
+++ bullet.spec	9 Mar 2010 23:42:44 -0000	1.3
@@ -1,6 +1,6 @@
 Name: bullet
 Version: 2.75
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: 3D Collision Detection and Rigid Body Dynamics Library
 Group: Development/Libraries
 License: zlib and MIT and BSD
@@ -14,6 +14,8 @@ Source0: %{name}-%{version}-free.tar.gz
 # ./generate-tarball.sh 2.75
 Source1: generate-tarball.sh
 
+Source10: bullet.pc.cmake
+
 # See http://code.google.com/p/bullet/issues/detail?id=174
 Patch0: lib_suffix.patch
 
@@ -21,6 +23,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 BuildRequires: cmake, libGL-devel, libGLU-devel, freeglut-devel, libICE-devel
 
+# upstreamable patch (plus Source10 above)
+Patch10: bullet-2.75-cmake_pkgconfig.patch
+
 %description
 Bullet is a 3D Collision Detection and Rigid Body Dynamics Library for games
 and animation.
@@ -36,7 +41,11 @@ Development headers and libraries for %{
 
 %prep
 %setup -q
+
+install -p %{SOURCE10} .
+
 %patch0
+%patch10 -p1 -b .cmake_pkgconfig
 
 # Set these files to right permission
 chmod 644 src/LinearMath/btPoolAllocator.h
@@ -48,12 +57,11 @@ mv ChangeLog.utf8 ChangeLog
 
 %build
 %cmake -DBUILD_DEMOS=OFF -DBUILD_EXTRAS=OFF -DCMAKE_BUILD_TYPE=NONE .
-make VERBOSE=1 %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install/fast DESTDIR=$RPM_BUILD_ROOT
 
 pushd $RPM_BUILD_ROOT%{_libdir}
 for f in lib*.so.*.*
@@ -107,9 +115,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/BulletSoftBody/*.h
 %{_includedir}/LinearMath/*.h
 %{_libdir}/*.so
+%{_libdir}/pkgconfig/bullet.pc
 
 
 %changelog
+* Tue Mar 09 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.75-2
+- pkgconfig file not installed (#549051)
 
 * Sat Oct 03 2009 Thomas Kowaliczek <linuxdonald at linuxdonald.de> - 2.75-1
 - Updatet to new upstream version 2.75