rpms/LabPlot/F-12 LabPlot-1.6.0.2-define-missing-constant.patch, NONE, 1.1 LabPlot.spec, 1.19, 1.20
Kevin Kofler
kkofler at fedoraproject.org
Wed Oct 28 10:57:56 UTC 2009
Author: kkofler
Update of /cvs/pkgs/rpms/LabPlot/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29521/F-12
Modified Files:
LabPlot.spec
Added Files:
LabPlot-1.6.0.2-define-missing-constant.patch
Log Message:
* Wed Oct 28 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.6.0.2-8
- fix FTBFS with current GSL (GSL_CONST_CGSM_GAUSS undefined, patch from Debian)
LabPlot-1.6.0.2-define-missing-constant.patch:
constants.h | 4 ++++
1 file changed, 4 insertions(+)
--- NEW FILE LabPlot-1.6.0.2-define-missing-constant.patch ---
diff --git a/src/constants.h b/src/constants.h
index 77d76bf..1bada49 100644
--- a/src/constants.h
+++ b/src/constants.h
@@ -17,6 +17,10 @@
#endif
#endif
+#ifndef GSL_CONST_CGSM_GAUSS
+#define GSL_CONST_CGSM_GAUSS (1e0) /* g / abamp s^2 */
+#endif
+
#ifdef HAVE_R
#include <R.h>
#include <Rmath.h>
Index: LabPlot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/LabPlot/F-12/LabPlot.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- LabPlot.spec 24 Oct 2009 02:19:16 -0000 1.19
+++ LabPlot.spec 28 Oct 2009 10:57:56 -0000 1.20
@@ -1,6 +1,6 @@
Name: LabPlot
Version: 1.6.0.2
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Data Analysis and Visualization
License: GPLv2+
@@ -10,7 +10,8 @@ URL: http://labplot.source
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: http://downloads.sourceforge.net/labplot/%{name}-%{version}.tar.bz2
-Patch2: LabPlot-20080225.patch
+Patch0: LabPlot-20080225.patch
+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
@@ -112,7 +113,8 @@ a Data Analysis and Visualization softwa
%prep
%setup -q -n %{name}-%{version}
-%patch2 -p1 -b .orig
+%patch0 -p1 -b .orig
+%patch1 -p1 -b .define-missing-constant
%{__sed} -i.system-wide -e 's|\.\./liborigin/libLabPlotorigin.la||' src/Makefile.in
@@ -353,6 +355,9 @@ update-desktop-database &> /dev/null ||:
%Changelog
+* Wed Oct 28 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.6.0.2-8
+- fix FTBFS with current GSL (GSL_CONST_CGSM_GAUSS undefined, patch from Debian)
+
* Sat Oct 24 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.6.0.2-7
- drop ExcludeArch ppc64, OCaml is available for ppc64 these days
More information about the fedora-extras-commits
mailing list