rpms/meshmagick/F-12 meshmagick-0.6.0-debuginfo.patch, NONE, 1.1 meshmagick-0.6.0-fixbuild.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 meshmagick.spec, 1.4, 1.5 sources, 1.2, 1.3 meshmagick-0.5.2-debuginfo.patch, 1.1, NONE

[Alexey Torkhov]

Author: atorkhov

Update of /cvs/pkgs/rpms/meshmagick/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2563

Modified Files:
	.cvsignore meshmagick.spec sources 
Added Files:
	meshmagick-0.6.0-debuginfo.patch 
	meshmagick-0.6.0-fixbuild.patch 
Removed Files:
	meshmagick-0.5.2-debuginfo.patch 
Log Message:
* Mon Oct 12 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.6.0-1.20090529svn2698
- Update


meshmagick-0.6.0-debuginfo.patch:
 configure.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE meshmagick-0.6.0-debuginfo.patch ---
diff -ur meshmagick/configure.in meshmagick.orig/configure.in
--- meshmagick/configure.in	2009-01-11 01:15:16.000000000 +0300
+++ meshmagick.orig/configure.in	2009-10-12 23:15:57.000000000 +0400
@@ -17,7 +17,7 @@
 if test "$enable_debug" = "yes"; then
     CXXFLAGS="$CXXFLAGS -g -O0 -DDEBUG"
 else
-    CXXFLAGS="$CXXFLAGS -O2 -DNDEBUG -s"
+    CXXFLAGS="$CXXFLAGS -O2 -DNDEBUG"
 fi
 
 # Pthreads

meshmagick-0.6.0-fixbuild.patch:
 Makefile.am |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE meshmagick-0.6.0-fixbuild.patch ---
diff -ur meshmagick.orig/include/Makefile.am meshmagick/include/Makefile.am
--- meshmagick.orig/include/Makefile.am	2009-05-29 02:32:09.000000000 +0400
+++ meshmagick/include/Makefile.am	2009-10-12 23:36:06.000000000 +0400
@@ -22,6 +22,4 @@
 	MmToolManager.h \
 	MmToolUtils.h \
 	MmTransformToolFactory.h \
-	MmTransformTool.h \
-	MmStatefulMeshSerializer.h \
-	MmStatefulSkeletonSerializer.h 
+	MmTransformTool.h


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/meshmagick/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	5 Mar 2009 20:13:45 -0000	1.2
+++ .cvsignore	12 Oct 2009 20:04:25 -0000	1.3
@@ -1 +1 @@
-meshmagick-0.5.2.tar.bz2
+meshmagick-0.6.0-r2698.tar.bz2


Index: meshmagick.spec
===================================================================
RCS file: /cvs/pkgs/rpms/meshmagick/F-12/meshmagick.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- meshmagick.spec	28 Sep 2009 10:26:56 -0000	1.4
+++ meshmagick.spec	12 Oct 2009 20:04:26 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           meshmagick
-Version:        0.5.2
-Release:        7.20090124svn2618%{?dist}
+Version:        0.6.0
+Release:        1.20090529svn2698%{?dist}
 Summary:        Command line manipulation tool for Ogre meshes
 
 Group:          Applications/Multimedia
@@ -8,13 +8,14 @@ License:        LGPLv2+
 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 2618 https://ogreaddons.svn.sourceforge.net/svnroot/ogreaddons/trunk/meshmagick meshmagick
-#  cd meshmagick
-#  ./bootstrap && ./configure && make dist-bzip2
-Source0:        %{name}-%{version}.tar.bz2
-Patch0:         meshmagick-0.5.2-debuginfo.patch
+#  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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  autoconf automake libtool
 BuildRequires:  ogre-devel
 
 %description
@@ -43,13 +44,15 @@ developing applications that use %{name}
 
 
 %prep
-%setup -q
+%setup -q -n %{name}
 %patch0 -p1
-chmod -x include/{EditableMesh.h,EditableSkeleton.h,RenameToolFactory.h,RenameTool.h} src/{EditableMesh.cpp,EditableSkeleton.cpp,RenameToolFactory.cpp,RenameTool.cpp}
+%patch1 -p1
 
 
 %build
+./bootstrap
 %configure --disable-static
+#cmake .
 make %{?_smp_mflags}
 
 
@@ -85,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 12 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.6.0-1.20090529svn2698
+- Update
+
 * Mon Sep 28 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.5.2-7.20090124svn2618
 - Rebuilt for new OGRE
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/meshmagick/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	5 Mar 2009 20:13:45 -0000	1.2
+++ sources	12 Oct 2009 20:04:26 -0000	1.3
@@ -1 +1 @@
-aa2e668e74259b16d4d46596b566c306  meshmagick-0.5.2.tar.bz2
+4419b51634612ccaeff8e067278701fb  meshmagick-0.6.0-r2698.tar.bz2


--- meshmagick-0.5.2-debuginfo.patch DELETED ---