[LabPlot] Update to 1.6.0.3 and fix chrpath issue

Thibault North tnorth at fedoraproject.org
Wed Nov 21 19:01:19 UTC 2012


commit 316963b7e0605fb23ed3d2b15449676f25734bfa
Author: Thibault North <tnorth at fedoraproject.org>
Date:   Wed Nov 21 13:50:31 2012 -0500

    Update to 1.6.0.3 and fix chrpath issue

 .gitignore   |    1 +
 LabPlot.spec |   19 ++++++++++++-------
 sources      |    2 +-
 3 files changed, 14 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d08303f..3475b26 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 LabPlot-1.6.0.2.tar.bz2
+/LabPlot-1.6.0.3.tar.gz
diff --git a/LabPlot.spec b/LabPlot.spec
index 52866c9..a3dbaa7 100644
--- a/LabPlot.spec
+++ b/LabPlot.spec
@@ -4,8 +4,8 @@
 # S#2759043 Segfault in TableModel::handleAspectRemoved() - can't reproduce
 
 Name:              LabPlot
-Version:           1.6.0.2
-Release:           12%{?dist}
+Version:           1.6.0.3
+Release:           1%{?dist}
 Summary:           Data Analysis and Visualization
 
 License:           GPLv2+
@@ -13,7 +13,7 @@ Group:             Applications/Engineering
 URL:               http://labplot.sourceforge.net/
 
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0:           http://downloads.sourceforge.net/labplot/%{name}-%{version}.tar.bz2
+Source0:           http://downloads.sourceforge.net/labplot/%{name}-%{version}.tar.gz
 
 Patch0:            LabPlot-20080225.patch
 Patch1:            LabPlot-1.6.0.2-define-missing-constant.patch
@@ -21,7 +21,7 @@ Patch1:            LabPlot-1.6.0.2-define-missing-constant.patch
 BuildRequires:     kdelibs3-devel libselinux-devel desktop-file-utils libexif-devel netcdf-devel
 BuildRequires:     gsl-devel ImageMagick-c++-devel fftw-devel jasper-devel qwtplot3d-devel
 BuildRequires:     pstoedit libtool qt-qsa-devel gettext htmldoc audiofile-devel ocaml
-BuildRequires:     liborigin-devel qhull-devel
+BuildRequires:     liborigin-devel qhull-devel chrpath
 BuildRequires:     R-devel
 
 ExcludeArch:       sparc64 s390 s390x
@@ -168,6 +168,7 @@ export QWT3D_PATH="$QTDIR"
   --enable-system-qwtplot3d \
   --enable-libundo          \
   --enable-system-liborigin \
+  --disable-rpath \
   --with-qt-librairies=%{_libdir}/qt3
 
 # clean unused-direct-shlib-dependencies
@@ -189,7 +190,7 @@ desktop-file-install --vendor fedora           \
     --remove-category Science                  \
     --remove-category Physics                  \
     --remove-category Math                     \
-    --add-category "Electronics"	           \
+    --add-category "Electronics"               \
     --dir %{buildroot}%{_datadir}/applications \
     %{buildroot}%{_datadir}/applications/kde/%{name}.desktop
 
@@ -271,6 +272,9 @@ done
 %{__rm} -f %{buildroot}%{_libdir}/lib%{name}cephes.so
 %{__rm} -f %{buildroot}%{_libdir}/lib%{name}netCDF.so
 
+# rpath fix:
+chrpath -d %{buildroot}%{_libdir}/lib%{name}.so*
+chrpath -d %{buildroot}%{_bindir}/%{name}
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -302,8 +306,6 @@ update-desktop-database &> /dev/null ||:
 %{_bindir}/texvc
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/apps/%{name}/
-%{_datadir}/icons/??color/??x??/apps/%{name}.png
-%{_datadir}/icons/??color/??x??/mimetypes/lpl.png
 %{_datadir}/mimelnk/application/x-l?l.desktop
 %{_libdir}/lib%{name}.so.1*
 %{_libdir}/lib%{name}cephes.so.1*
@@ -359,6 +361,9 @@ update-desktop-database &> /dev/null ||:
 
 
 %Changelog
+* Mon Nov 19 2012 Thibault North <tnorth at fedoraproject.org> - 1.6.0.3-1
+- Update to 1.6.0.3
+
 * Sun Dec 4 2011 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.6.0.2-9
 - Fixes Bug RH#715933 - FTBFS LabPlot-1.6.0.2-8.fc12
 
diff --git a/sources b/sources
index 64dd8db..df099d4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-59a9448190b2ebc9b23670f9262a1947  LabPlot-1.6.0.2.tar.bz2
+a5f24021409ce52ba8810d73f8f03a3e  LabPlot-1.6.0.3.tar.gz


More information about the scm-commits mailing list