[chipmunk] 5.3.1.

[Jon Ciesla]

commit ac06701b04cc1f62a8cef085e9e500b7855f1590
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Fri Aug 20 08:48:32 2010 -0500

    5.3.1.

 .gitignore                   |    1 +
 chipmunk-5.2.0-dsolink.patch |   11 ++++++
 chipmunk.spec                |   71 ++++++++++++++++++++++++-----------------
 sources                      |    2 +-
 4 files changed, 54 insertions(+), 31 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8b7e5e3..3011b08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 Chipmunk-4.1.0.tgz
+/Chipmunk-5.3.1.tgz
diff --git a/chipmunk-5.2.0-dsolink.patch b/chipmunk-5.2.0-dsolink.patch
new file mode 100644
index 0000000..986f8c0
--- /dev/null
+++ b/chipmunk-5.2.0-dsolink.patch
@@ -0,0 +1,11 @@
+--- Demo/CMakeLists.txt~	2010-01-19 14:50:25.000000000 -0600
++++ Demo/CMakeLists.txt	2010-07-15 08:41:34.182317902 -0500
+@@ -17,7 +17,7 @@
+ 
+ include_directories(${chipmunk_demos_include_dirs})
+ add_executable(chipmunk_demos ${chipmunk_demos_source_files})
+-target_link_libraries(chipmunk_demos ${chipmunk_demos_libraries})
++target_link_libraries(chipmunk_demos ${chipmunk_demos_libraries} -lm)
+ 
+ if(INSTALL_DEMOS)
+   install(TARGETS chipmunk_demos RUNTIME DESTINATION bin)
diff --git a/chipmunk.spec b/chipmunk.spec
index d419348..a3470ee 100644
--- a/chipmunk.spec
+++ b/chipmunk.spec
@@ -1,15 +1,16 @@
 %{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")}
 Name:           chipmunk
-Version:        4.1.0
-Release:        9%{?dist}
+Version:        5.3.1
+Release:        1%{?dist}
 Summary:        Physics engine for 2D games
 
 Group:          Development/Libraries
 License:        MIT
 URL:            http://code.google.com/p/chipmunk-physics/
 Source0:        http://files.slembcke.net/chipmunk/release/Chipmunk-%{version}.tgz
-Patch0:         chipmunk-4.1.0-cmake.patch
-Patch1:         chipmunk-4.1.0-dsolink.patch
+#Patch0:         chipmunk-4.1.0-cmake.patch
+#Patch1:         chipmunk-4.1.0-dsolink.patch
+Patch2:         chipmunk-5.2.0-dsolink.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: cmake
@@ -18,7 +19,8 @@ BuildRequires: mesa-libGL-devel
 BuildRequires: ruby, ruby-devel
 BuildRequires: libX11-devel
 BuildRequires: libXext-devel
-BuildRequires: ruby
+#BuildRequires: ruby
+Obsoletes:	chipmunk-ruby <= 4.1.0-9
 
 %description
 Chipmunk is a 2D rigid body physics library distributed under the MIT license.
@@ -41,25 +43,26 @@ programs that will use the chipmunk library.  You should
 install this package if you need to develop programs which will use the 
 chipmunk library functions.  You'll also need to install the chipmunk package.
 
-%package        ruby
-Summary:        Ruby interface to the chipmunk library
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-Requires:       ruby(abi) = 1.8
-
-%description    ruby
-Chipmunk is a 2D rigid body physics library distributed under the MIT license.
-Though not yet complete, it is intended to be fast, numerically stable, and 
-easy to use.
-
-This package contains the Ruby interface to the chipmunk library.
-You'll also need to install the chipmunk package.
+#%package        ruby
+#Summary:        Ruby interface to the chipmunk library
+#Group:          Development/Libraries
+#Requires:       %{name} = %{version}-%{release}
+#Requires:       ruby(abi) = 1.8
+#
+#%description    ruby
+#Chipmunk is a 2D rigid body physics library distributed under the MIT license.
+#Though not yet complete, it is intended to be fast, numerically stable, and 
+#easy to use.
+#
+#This package contains the Ruby interface to the chipmunk library.
+#You'll also need to install the chipmunk package.
 
 
 %prep
 %setup -qn Chipmunk-%{version}
-%patch0 -p1
-%patch1 -p0
+#%patch0 -p1
+#%patch1 -p0
+%patch2 -p0
 
 %build
 %if "%{?_lib}" == "lib64"
@@ -69,16 +72,16 @@ You'll also need to install the chipmunk package.
 %endif 
 
 %{__make} VERBOSE=1 %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
-pushd ruby
-ruby extconf.rb
-make
-popd
+#pushd ruby
+#ruby extconf.rb
+#make
+#popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT/%{ruby_sitearch}
-install -m 755 ruby/chipmunk.so $RPM_BUILD_ROOT/%{ruby_sitearch}
+#mkdir -p $RPM_BUILD_ROOT/%{ruby_sitearch}
+#install -m 755 ruby/chipmunk.so $RPM_BUILD_ROOT/%{ruby_sitearch}
 
 make install DESTDIR=$RPM_BUILD_ROOT
 %if "%{?_lib}" == "lib64" 
@@ -94,7 +97,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc docsrc/ LICENSE.txt README.txt
+%doc LICENSE.txt README.txt
 %{_libdir}/*.so.*
 %exclude %{_libdir}/*.a
 
@@ -104,12 +107,20 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/chipmunk
 %{_libdir}/*.so
 
-%files ruby
-%defattr(-,root,root,-)
-%{ruby_sitearch}/chipmunk.so
+#%files ruby
+#%defattr(-,root,root,-)
+#%{ruby_sitearch}/chipmunk.so
 
 
 %changelog
+* Fri Aug 20 2010 Jon Ciesla <limb at jcomserv.net> - 5.3.1-1
+- latest upstream.
+
+* Thu Jul 15 2010 Jon Ciesla <limb at jcomserv.net> - 5.2.0-1
+- Latest upstream, BZ 545475.
+- Dropped cmake patch, updated dsolink patch.
+- Dropped ruby extension for now, not up to date per upstream.
+
 * Mon Jun 28 2010 Jon Ciesla <limb at jcomserv.net> - 4.1.0-9
 - Fix FTBFS, BZ 599950.
 
diff --git a/sources b/sources
index cb14915..48e521b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-804d0e478f2a27a1d272fa07e41480ba  Chipmunk-4.1.0.tgz
+9271b76acc634fbbbba9d85378dbeeff  Chipmunk-5.3.1.tgz