[meshlab] Update to upstream 1.3.1.

Eric Smith brouhaha at fedoraproject.org
Thu Oct 6 06:10:15 UTC 2011 

commit 302a3189be73188f70cb04682ab8b694456d405e
Author: Eric Smith <eric at brouhaha.com>
Date:   Wed Oct 5 23:10:14 2011 -0700

    Update to upstream 1.3.1.

 .gitignore                                         |    1 +
 ...haredlib.patch => meshlab-1.3.1-sharedlib.patch |  104 ++++++++++++--------
 meshlab.spec                                       |   37 +++++--
 sources                                            |    2 +-
 4 files changed, 93 insertions(+), 51 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4e3cc27..8179468 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 MeshLabSrc_v122.tar.gz
 /MeshLabSrc_AllInc_v130a.tgz
+/MeshLabSrc_AllInc_v131.tgz
diff --git a/meshlab-1.3.0a-sharedlib.patch b/meshlab-1.3.1-sharedlib.patch
similarity index 65%
rename from meshlab-1.3.0a-sharedlib.patch
rename to meshlab-1.3.1-sharedlib.patch
index d746bb9..2cd5968 100644
--- a/meshlab-1.3.0a-sharedlib.patch
+++ b/meshlab-1.3.1-sharedlib.patch
@@ -1,6 +1,6 @@
-diff -up meshlab-1.3.0/meshlab/src/common/common.pro.sharedlib meshlab-1.3.0/meshlab/src/common/common.pro
---- meshlab-1.3.0/meshlab/src/common/common.pro.sharedlib	2011-01-25 00:49:48.000000000 -0700
-+++ meshlab-1.3.0/meshlab/src/common/common.pro	2011-08-03 17:14:44.000000000 -0600
+diff -up meshlab-1.3.1/meshlab/src/common/common.pro.sharedlib meshlab-1.3.1/meshlab/src/common/common.pro
+--- meshlab-1.3.1/meshlab/src/common/common.pro.sharedlib	2011-01-24 23:49:48.000000000 -0800
++++ meshlab-1.3.1/meshlab/src/common/common.pro	2011-10-05 19:59:01.000000000 -0700
 @@ -1,7 +1,4 @@
  VCGDIR = ../../../vcglib
 -GLEWDIR = ../external/glew-1.5.1
@@ -40,9 +40,9 @@ diff -up meshlab-1.3.0/meshlab/src/common/common.pro.sharedlib meshlab-1.3.0/mes
  	xmlfilterinfo.cpp \
 -    $$GLEWCODE \
      meshlabdocumentxml.cpp
-diff -up meshlab-1.3.0/meshlab/src/external/external.pro.sharedlib meshlab-1.3.0/meshlab/src/external/external.pro
---- meshlab-1.3.0/meshlab/src/external/external.pro.sharedlib	2011-01-25 00:49:46.000000000 -0700
-+++ meshlab-1.3.0/meshlab/src/external/external.pro	2011-08-03 17:18:55.000000000 -0600
+diff -up meshlab-1.3.1/meshlab/src/external/external.pro.sharedlib meshlab-1.3.1/meshlab/src/external/external.pro
+--- meshlab-1.3.1/meshlab/src/external/external.pro.sharedlib	2011-01-24 23:49:46.000000000 -0800
++++ meshlab-1.3.1/meshlab/src/external/external.pro	2011-10-05 19:59:01.000000000 -0700
 @@ -2,9 +2,5 @@ config += debug_and_release
  
  TEMPLATE      = subdirs
@@ -54,9 +54,9 @@ diff -up meshlab-1.3.0/meshlab/src/external/external.pro.sharedlib meshlab-1.3.0
 -                structuresynth/structuresynth.pro
 +SUBDIRS       = structuresynth/structuresynth.pro
  #                openkinect/openkinect.pro
-diff -up meshlab-1.3.0/meshlab/src/fgt/filter_func/filter_func.pro.sharedlib meshlab-1.3.0/meshlab/src/fgt/filter_func/filter_func.pro
---- meshlab-1.3.0/meshlab/src/fgt/filter_func/filter_func.pro.sharedlib	2011-01-25 00:49:30.000000000 -0700
-+++ meshlab-1.3.0/meshlab/src/fgt/filter_func/filter_func.pro	2011-08-03 17:14:44.000000000 -0600
+diff -up meshlab-1.3.1/meshlab/src/fgt/filter_func/filter_func.pro.sharedlib meshlab-1.3.1/meshlab/src/fgt/filter_func/filter_func.pro
+--- meshlab-1.3.1/meshlab/src/fgt/filter_func/filter_func.pro.sharedlib	2011-01-24 23:49:30.000000000 -0800
++++ meshlab-1.3.1/meshlab/src/fgt/filter_func/filter_func.pro	2011-10-05 19:59:01.000000000 -0700
 @@ -6,15 +6,11 @@ SOURCES       += filter_func.cpp
  
  TARGET        = filter_func
@@ -74,9 +74,35 @@ diff -up meshlab-1.3.0/meshlab/src/fgt/filter_func/filter_func.pro.sharedlib mes
 -linux-g++-64:LIBS       += ../../external/lib/linux-g++-64/libmuparser.a
 +linux-g++:LIBS       += -lmuparser
  win32-g++:LIBS		 += ../../external/lib/win32-gcc/libmuparser.a
-diff -up meshlab-1.3.0/meshlab/src/fgt/filter_qhull/filter_qhull.pro.sharedlib meshlab-1.3.0/meshlab/src/fgt/filter_qhull/filter_qhull.pro
---- meshlab-1.3.0/meshlab/src/fgt/filter_qhull/filter_qhull.pro.sharedlib	2011-01-25 00:49:27.000000000 -0700
-+++ meshlab-1.3.0/meshlab/src/fgt/filter_qhull/filter_qhull.pro	2011-08-03 17:14:44.000000000 -0600
+diff -up meshlab-1.3.1/meshlab/src/fgt/filter_photosynth/filter_photosynth.pro.sharedlib meshlab-1.3.1/meshlab/src/fgt/filter_photosynth/filter_photosynth.pro
+--- meshlab-1.3.1/meshlab/src/fgt/filter_photosynth/filter_photosynth.pro.sharedlib	2011-02-15 01:39:46.000000000 -0800
++++ meshlab-1.3.1/meshlab/src/fgt/filter_photosynth/filter_photosynth.pro	2011-10-05 19:59:01.000000000 -0700
+@@ -1,17 +1,15 @@
+ include (../../shared.pri)
+ 
+-QTSOAPDIR = ../../external/qtsoap-2.7_1/src
+-
+-INCLUDEPATH += $$QTSOAPDIR
++INCLUDEPATH += /usr/include/QtSoap
+ 
+ HEADERS       += filter_photosynth.h \
+-                 synthData.h \
+-                 $$QTSOAPDIR/qtsoap.h
++                 synthData.h
+ 
+ SOURCES       += filter_photosynth.cpp \
+-                 downloader.cpp \
+-                 $$QTSOAPDIR/qtsoap.cpp
++                 downloader.cpp
+ 
+ TARGET         = filter_photosynth
+ 
++linux-g++:LIBS += -lqtsoap
++
+ QT += network
+diff -up meshlab-1.3.1/meshlab/src/fgt/filter_qhull/filter_qhull.pro.sharedlib meshlab-1.3.1/meshlab/src/fgt/filter_qhull/filter_qhull.pro
+--- meshlab-1.3.1/meshlab/src/fgt/filter_qhull/filter_qhull.pro.sharedlib	2011-01-24 23:49:27.000000000 -0800
++++ meshlab-1.3.1/meshlab/src/fgt/filter_qhull/filter_qhull.pro	2011-10-05 19:59:01.000000000 -0700
 @@ -8,28 +8,8 @@ HEADERS       += filter_qhull.h \
  SOURCES       += filter_qhull.cpp \ 
  		qhull_tools.cpp 
@@ -110,9 +136,9 @@ diff -up meshlab-1.3.0/meshlab/src/fgt/filter_qhull/filter_qhull.pro.sharedlib m
 -TARGET        = filter_qhull
 \ No newline at end of file
 +TARGET        = filter_qhull
-diff -up meshlab-1.3.0/meshlab/src/fgt/filter_qhull/qhull_tools.h.sharedlib meshlab-1.3.0/meshlab/src/fgt/filter_qhull/qhull_tools.h
---- meshlab-1.3.0/meshlab/src/fgt/filter_qhull/qhull_tools.h.sharedlib	2011-01-25 00:49:27.000000000 -0700
-+++ meshlab-1.3.0/meshlab/src/fgt/filter_qhull/qhull_tools.h	2011-08-03 17:14:44.000000000 -0600
+diff -up meshlab-1.3.1/meshlab/src/fgt/filter_qhull/qhull_tools.h.sharedlib meshlab-1.3.1/meshlab/src/fgt/filter_qhull/qhull_tools.h
+--- meshlab-1.3.1/meshlab/src/fgt/filter_qhull/qhull_tools.h.sharedlib	2011-01-24 23:49:27.000000000 -0800
++++ meshlab-1.3.1/meshlab/src/fgt/filter_qhull/qhull_tools.h	2011-10-05 19:59:01.000000000 -0700
 @@ -55,14 +55,14 @@ extern "C"
  #endif
  #include <stdio.h>
@@ -136,9 +162,9 @@ diff -up meshlab-1.3.0/meshlab/src/fgt/filter_qhull/qhull_tools.h.sharedlib mesh
  #if defined(__cplusplus)
  }
  #endif
-diff -up meshlab-1.3.0/meshlab/src/meshlab/meshlab.pro.sharedlib meshlab-1.3.0/meshlab/src/meshlab/meshlab.pro
---- meshlab-1.3.0/meshlab/src/meshlab/meshlab.pro.sharedlib	2011-02-15 02:39:47.000000000 -0700
-+++ meshlab-1.3.0/meshlab/src/meshlab/meshlab.pro	2011-08-03 17:14:44.000000000 -0600
+diff -up meshlab-1.3.1/meshlab/src/meshlab/meshlab.pro.sharedlib meshlab-1.3.1/meshlab/src/meshlab/meshlab.pro
+--- meshlab-1.3.1/meshlab/src/meshlab/meshlab.pro.sharedlib	2011-02-15 01:39:47.000000000 -0800
++++ meshlab-1.3.1/meshlab/src/meshlab/meshlab.pro	2011-10-05 20:00:09.000000000 -0700
 @@ -1,5 +1,4 @@
  VCGDIR = ../../../vcglib
 -GLEWDIR = ../external/glew-1.5.1
@@ -179,9 +205,9 @@ diff -up meshlab-1.3.0/meshlab/src/meshlab/meshlab.pro.sharedlib meshlab-1.3.0/m
  
  
  # uncomment in your local copy only in emergency cases.
-diff -up meshlab-1.3.0/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro.sharedlib meshlab-1.3.0/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro
---- meshlab-1.3.0/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro.sharedlib	2011-01-25 00:50:05.000000000 -0700
-+++ meshlab-1.3.0/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro	2011-08-03 17:14:44.000000000 -0600
+diff -up meshlab-1.3.1/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro.sharedlib meshlab-1.3.1/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro
+--- meshlab-1.3.1/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro.sharedlib	2011-01-24 23:50:05.000000000 -0800
++++ meshlab-1.3.1/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro	2011-10-05 19:59:01.000000000 -0700
 @@ -23,8 +23,7 @@ HEADERS       += ./diamond_sampler.h \
  SOURCES       += ./filter_isoparametrization.cpp 
  				
@@ -203,9 +229,9 @@ diff -up meshlab-1.3.0/meshlab/src/meshlabplugins/filter_isoparametrization/filt
  macx:LIBS += ../../../src/external/lib/macx/liblevmar.a
  
  # Please never ever uncomment this...
-diff -up meshlab-1.3.0/meshlab/src/meshlabplugins/filter_isoparametrization/param_collapse.h.sharedlib meshlab-1.3.0/meshlab/src/meshlabplugins/filter_isoparametrization/param_collapse.h
---- meshlab-1.3.0/meshlab/src/meshlabplugins/filter_isoparametrization/param_collapse.h.sharedlib	2011-01-25 00:50:05.000000000 -0700
-+++ meshlab-1.3.0/meshlab/src/meshlabplugins/filter_isoparametrization/param_collapse.h	2011-08-03 17:14:44.000000000 -0600
+diff -up meshlab-1.3.1/meshlab/src/meshlabplugins/filter_isoparametrization/param_collapse.h.sharedlib meshlab-1.3.1/meshlab/src/meshlabplugins/filter_isoparametrization/param_collapse.h
+--- meshlab-1.3.1/meshlab/src/meshlabplugins/filter_isoparametrization/param_collapse.h.sharedlib	2011-01-24 23:50:05.000000000 -0800
++++ meshlab-1.3.1/meshlab/src/meshlabplugins/filter_isoparametrization/param_collapse.h	2011-10-05 19:59:01.000000000 -0700
 @@ -14,7 +14,7 @@
  
  #include <local_parametrization.h>
@@ -215,9 +241,9 @@ diff -up meshlab-1.3.0/meshlab/src/meshlabplugins/filter_isoparametrization/para
  #include <uv_grid.h>
  
  #include "opt_patch.h"
-diff -up meshlab-1.3.0/meshlab/src/meshlabplugins/filter_isoparametrization/parametrizator.h.sharedlib meshlab-1.3.0/meshlab/src/meshlabplugins/filter_isoparametrization/parametrizator.h
---- meshlab-1.3.0/meshlab/src/meshlabplugins/filter_isoparametrization/parametrizator.h.sharedlib	2011-01-25 00:50:05.000000000 -0700
-+++ meshlab-1.3.0/meshlab/src/meshlabplugins/filter_isoparametrization/parametrizator.h	2011-08-03 17:14:44.000000000 -0600
+diff -up meshlab-1.3.1/meshlab/src/meshlabplugins/filter_isoparametrization/parametrizator.h.sharedlib meshlab-1.3.1/meshlab/src/meshlabplugins/filter_isoparametrization/parametrizator.h
+--- meshlab-1.3.1/meshlab/src/meshlabplugins/filter_isoparametrization/parametrizator.h.sharedlib	2011-01-24 23:50:05.000000000 -0800
++++ meshlab-1.3.1/meshlab/src/meshlabplugins/filter_isoparametrization/parametrizator.h	2011-10-05 19:59:01.000000000 -0700
 @@ -34,7 +34,7 @@
  #include <vcg/space/color4.h>
  #include <dual_coord_optimization.h>
@@ -227,9 +253,9 @@ diff -up meshlab-1.3.0/meshlab/src/meshlabplugins/filter_isoparametrization/para
  #ifndef _MESHLAB
  #include <wrap/io_trimesh/export_ply.h>
  #endif
-diff -up meshlab-1.3.0/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro.sharedlib meshlab-1.3.0/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro
---- meshlab-1.3.0/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro.sharedlib	2011-01-25 00:49:55.000000000 -0700
-+++ meshlab-1.3.0/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro	2011-08-03 17:14:44.000000000 -0600
+diff -up meshlab-1.3.1/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro.sharedlib meshlab-1.3.1/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro
+--- meshlab-1.3.1/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro.sharedlib	2011-01-24 23:49:55.000000000 -0800
++++ meshlab-1.3.1/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro	2011-10-05 19:59:01.000000000 -0700
 @@ -14,7 +14,7 @@ SOURCES       += 	meshio.cpp \
  
  TARGET        = io_3ds
@@ -250,9 +276,9 @@ diff -up meshlab-1.3.0/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro.sharedlib me
  
  # unix:LIBS		+= -L../../../../code/lib/lib3ds-1.3.0/lib3ds/lib/unix -l3ds
  
-diff -up meshlab-1.3.0/meshlab/src/meshlabplugins/io_epoch/io_epoch.pro.sharedlib meshlab-1.3.0/meshlab/src/meshlabplugins/io_epoch/io_epoch.pro
---- meshlab-1.3.0/meshlab/src/meshlabplugins/io_epoch/io_epoch.pro.sharedlib	2011-01-25 00:50:02.000000000 -0700
-+++ meshlab-1.3.0/meshlab/src/meshlabplugins/io_epoch/io_epoch.pro	2011-08-03 17:14:44.000000000 -0600
+diff -up meshlab-1.3.1/meshlab/src/meshlabplugins/io_epoch/io_epoch.pro.sharedlib meshlab-1.3.1/meshlab/src/meshlabplugins/io_epoch/io_epoch.pro
+--- meshlab-1.3.1/meshlab/src/meshlabplugins/io_epoch/io_epoch.pro.sharedlib	2011-01-24 23:50:02.000000000 -0800
++++ meshlab-1.3.1/meshlab/src/meshlabplugins/io_epoch/io_epoch.pro	2011-10-05 19:59:01.000000000 -0700
 @@ -30,16 +30,11 @@ QT           += xml
  win32-msvc2005:LIBS	   += ../../external/lib/win32-msvc2005/bz2.lib
  win32-msvc2008:LIBS	   += ../../external/lib/win32-msvc2008/bz2.lib
@@ -271,9 +297,9 @@ diff -up meshlab-1.3.0/meshlab/src/meshlabplugins/io_epoch/io_epoch.pro.sharedli
  
  mac:LIBS   += -lbz2
  
-diff -up meshlab-1.3.0/meshlab/src/meshlabserver/meshlabserver.pro.sharedlib meshlab-1.3.0/meshlab/src/meshlabserver/meshlabserver.pro
---- meshlab-1.3.0/meshlab/src/meshlabserver/meshlabserver.pro.sharedlib	2011-01-25 00:49:46.000000000 -0700
-+++ meshlab-1.3.0/meshlab/src/meshlabserver/meshlabserver.pro	2011-08-03 17:14:44.000000000 -0600
+diff -up meshlab-1.3.1/meshlab/src/meshlabserver/meshlabserver.pro.sharedlib meshlab-1.3.1/meshlab/src/meshlabserver/meshlabserver.pro
+--- meshlab-1.3.1/meshlab/src/meshlabserver/meshlabserver.pro.sharedlib	2011-01-24 23:49:46.000000000 -0800
++++ meshlab-1.3.1/meshlab/src/meshlabserver/meshlabserver.pro	2011-10-05 20:01:25.000000000 -0700
 @@ -1,5 +1,3 @@
 -GLEWDIR = ../external/glew-1.5.1
 -
@@ -303,9 +329,9 @@ diff -up meshlab-1.3.0/meshlab/src/meshlabserver/meshlabserver.pro.sharedlib mes
  CONFIG += stl 
  CONFIG += console
  
-diff -up meshlab-1.3.0/meshlab/src/shared.pri.sharedlib meshlab-1.3.0/meshlab/src/shared.pri
---- meshlab-1.3.0/meshlab/src/shared.pri.sharedlib	2011-01-25 00:50:20.000000000 -0700
-+++ meshlab-1.3.0/meshlab/src/shared.pri	2011-08-03 17:14:44.000000000 -0600
+diff -up meshlab-1.3.1/meshlab/src/shared.pri.sharedlib meshlab-1.3.1/meshlab/src/shared.pri
+--- meshlab-1.3.1/meshlab/src/shared.pri.sharedlib	2011-01-24 23:50:20.000000000 -0800
++++ meshlab-1.3.1/meshlab/src/shared.pri	2011-10-05 19:59:01.000000000 -0700
 @@ -8,7 +8,6 @@ QT += xmlpatterns
  QT += script
  
diff --git a/meshlab.spec b/meshlab.spec
index 9fb3a1d..3695f92 100644
--- a/meshlab.spec
+++ b/meshlab.spec
@@ -1,19 +1,19 @@
 Summary:	A system for processing and editing unstructured 3D triangular meshes
 Name:		meshlab
-Version:	1.3.0a
-Release:	2%{?dist}
+Version:	1.3.1
+Release:	1%{?dist}
 URL:		http://meshlab.sourceforge.net/`
 
 Source0:	http://downloads.sourceforge.net/%{name}/MeshLabSrc_AllInc_v130a.tgz
 Source1:	meshlab-48x48.xpm
 
-# Meshlab v130a tarball is missing the docs directory. Reported upstream,
+# Meshlab v131 tarball is missing the docs directory. Reported upstream,
 # but for now we'll extract them from the v122 tarball.
-Source2:	http://downloads/sourceforge.net/%{name}/MeshLabSrc_v122.tar.gz
+Source2:	http://downloads.sourceforge.net/%{name}/MeshLabSrc_v122.tar.gz
 
 # Fedora-specific patches to use shared libraries, and to put plugins and
 # shaders in appropriate directories
-Patch0:		meshlab-1.3.0a-sharedlib.patch
+Patch0:		meshlab-1.3.1-sharedlib.patch
 Patch1:		meshlab-1.2.3a-plugin-path.patch
 Patch2:		meshlab-1.3.0a-shader-path.patch
 
@@ -36,8 +36,11 @@ BuildRequires:	lib3ds-devel
 BuildRequires:	muParser-devel
 BuildRequires:	qhull-devel
 BuildRequires:	qt-devel
-BuildRequires:	ImageMagick
+BuildRequires:	qtsoap-devel
+
+BuildRequires:	chrpath
 BuildRequires:	desktop-file-utils
+BuildRequires:	ImageMagick
 
 %description
 MeshLab is an open source, portable, and extensible system for the
@@ -69,7 +72,7 @@ find . \( -name *.h -o -name *.cpp -o -name *.inl \) -a -executable \
 # Remove bundled library sources, since we use the Fedora packaged
 # libraries
 rm -rf vcglib/wrap/system
-rm -rf meshlab/src/external/{ann*,bzip2*,glew*,levmar*,lib3ds*,muparser*,ode*,qhull*}
+rm -rf meshlab/src/external/{ann*,bzip2*,glew*,levmar*,lib3ds*,muparser*,ode*,qhull*,qtsoap*}
 
 %build
 # Build instructions from the wiki:
@@ -77,10 +80,10 @@ rm -rf meshlab/src/external/{ann*,bzip2*,glew*,levmar*,lib3ds*,muparser*,ode*,qh
 # Note that the build instructions in README.linux are out of date.
 
 cd meshlab/src/external
-%{_qt4_qmake} -spec linux-g++ -recursive external.pro
+%{_qt4_qmake} -recursive external.pro
 make %{?_smp_mflags} CFLAGS="%{optflags}"
 cd ..
-%{_qt4_qmake} -spec linux-g++ -recursive meshlab_full.pro
+%{_qt4_qmake} -recursive meshlab_full.pro
 make %{?_smp_mflags} CFLAGS="%{optflags}" \
 	DEFINES="-D__DISABLE_AUTO_STATS__ -DPLUGIN_DIR=\\\"%{_libdir}/%{name}\\\""
 
@@ -111,6 +114,16 @@ done
 %install
 rm -rf %{buildroot}
 
+# The QMAKE_RPATHDIR stuff puts in the path to the compile-time location
+# of libcommon, which won't work at runtime, so we change the rpath here.
+# The use of rpath will cause an rpmlint error, but the Fedora Packaging
+# Guidelines specifically allow use of an rpath for internal libraries:
+# http://fedoraproject.org/wiki/Packaging:Guidelines#Rpath_for_Internal_Libraries
+# Ideally upstream would rename the library to libmeshlab, libmeshlabcommon,
+# or the like, so that we could put it in the system library directory
+# and avoid rpath entirely.
+chrpath -r %{_libdir}/meshlab meshlab/src/distrib/{meshlab,meshlabserver}
+
 install -d -m 755 %{buildroot}%{_bindir}
 install -p -m 755 meshlab/src/distrib/meshlab \
 		  meshlab/src/distrib/meshlabserver \
@@ -183,8 +196,10 @@ rm -rf %{buildroot}
 %{_datadir}/pixmaps/meshlab.png
 
 %changelog
-* Mon Aug 08 2011 Eric Smith <eric at brouhaha.com> - 1.3.0a-2
-- use qmail -spec linux-g++ to fix FTBFS with qt 4.8
+* Wed Oct 05 2011 Eric Smith <eric at brouhaha.com> - 1.3.1-1
+- update to latest upstream release
+- removed bundled qtsoap, use shared library from Fedora package
+- fix rpath handling for internal-only library
 
 * Wed Aug 03 2011 Eric Smith <eric at brouhaha.com> - 1.3.0a-1
 - update to latest upstream release
diff --git a/sources b/sources
index 20a558d..d610e33 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
+da8c1eb07f219896dbcffe35111d21b1  MeshLabSrc_AllInc_v131.tgz
 f06107dd01cbe0d6519dbb759ae84c11  MeshLabSrc_v122.tar.gz
-46c14a0fce7bed03113d54807f3c19bc  MeshLabSrc_AllInc_v130a.tgz

More information about the scm-commits mailing list