[meshmagick/f15/master] Update to work with Ogre 1.7.

[Bruno Wolff III]

commit 26fb825834850342800599791020d400d2eb2a0b
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Sun Feb 20 20:38:19 2011 -0600

    Update to work with Ogre 1.7.

 .gitignore                       |    1 +
 meshmagick-0.6.0-debuginfo.patch |   12 ------------
 meshmagick-0.6.0-fixbuild.patch  |   11 -----------
 meshmagick-version.patch         |   13 +++++++++++++
 meshmagick.spec                  |   27 ++++++++++++++-------------
 sources                          |    2 +-
 6 files changed, 29 insertions(+), 37 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6ff6c51..556bf04 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 meshmagick-0.6.0-r2698.tar.bz2
+/meshmagick-0.6.0-r2898.tar.bz2
diff --git a/meshmagick-version.patch b/meshmagick-version.patch
new file mode 100644
index 0000000..4d31e2b
--- /dev/null
+++ b/meshmagick-version.patch
@@ -0,0 +1,13 @@
+--- CMakeLists.txt.orig	2011-02-20 20:25:47.000000000 -0600
++++ CMakeLists.txt	2011-02-20 20:26:02.000000000 -0600
+@@ -7,8 +7,8 @@
+ include(FeatureSummary)
+ 
+ set(MESHMAGICK_MAJOR_VERSION 0)
+-set(MESHMAGICK_MINOR_VERSION 5)
+-set(MESHMAGICK_PATCH_VERSION 2)
++set(MESHMAGICK_MINOR_VERSION 6)
++set(MESHMAGICK_PATCH_VERSION 0)
+ 
+ # include our custom cmake scripts
+ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
diff --git a/meshmagick.spec b/meshmagick.spec
index aeeb202..dc7287a 100644
--- a/meshmagick.spec
+++ b/meshmagick.spec
@@ -1,18 +1,17 @@
 Name:           meshmagick
 Version:        0.6.0
-Release:        2.20090529svn2698%{?dist}
+Release:        3.svn2898%{?dist}
 Summary:        Command line manipulation tool for Ogre meshes
 
 Group:          Applications/Multimedia
-License:        LGPLv2+
+License:        MIT
 URL:            http://www.ogre3d.org/wiki/index.php/MeshMagick
 # The source for this package was pulled from upstream's svn.  Use the
 # following commands to generate the tarball:
-#  svn export -r 2698 https://ogreaddons.svn.sourceforge.net/svnroot/ogreaddons/trunk/meshmagick meshmagick
-#  tar cjf meshmagick-0.6.0-r2698.tar.bz2 meshmagick
-Source0:        %{name}-%{version}-r2698.tar.bz2
-Patch0:         meshmagick-0.6.0-debuginfo.patch
-Patch1:         meshmagick-0.6.0-fixbuild.patch
+#  svn export -r 2898 https://ogreaddons.svn.sourceforge.net/svnroot/ogreaddons/trunk/meshmagick meshmagick
+#  tar cjf meshmagick-0.6.0-r2898.tar.bz2 meshmagick
+Source0:        %{name}-%{version}-r2898.tar.bz2
+Patch0:         meshmagick-version.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  autoconf automake libtool
@@ -45,14 +44,11 @@ developing applications that use %{name}.
 
 %prep
 %setup -q -n %{name}
-%patch0 -p1
-%patch1 -p1
+%patch0
 
 
 %build
-./bootstrap
-%configure --disable-static
-#cmake .
+%cmake . -DSTATIC_BUILD=FALSE
 make %{?_smp_mflags}
 
 
@@ -73,7 +69,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README
+%doc AUTHORS README LICENSE.txt
 %{_bindir}/%{name}
 
 %files libs
@@ -88,6 +84,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Feb 20 2011 Bruno Wolff III <bruno at wolff.to> - 0.6.0-3.svn2898
+- Update for Ogre 1.7
+- Switch to using cmake build
+- Update library versions to 0.6.0 to match meshmagick version
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.0-2.20090529svn2698
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index b63519e..17ec472 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4419b51634612ccaeff8e067278701fb  meshmagick-0.6.0-r2698.tar.bz2
+1d018de426dde267bafaa8da98e43688  meshmagick-0.6.0-r2898.tar.bz2