rpms/LabPlot/devel LabPlot-gcc43.patch, NONE, 1.1 LabPlot.spec, 1.8, 1.9
Alex Lancaster (alexlan)
fedora-extras-commits at redhat.com
Wed Jun 4 12:08:46 UTC 2008
Author: alexlan
Update of /cvs/pkgs/rpms/LabPlot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31387
Modified Files:
LabPlot.spec
Added Files:
LabPlot-gcc43.patch
Log Message:
Sync to F-9 branch: revert to 1.5.1.6 build, more work needed to get
1.6.0, will do after broken deps are fixed.
LabPlot-gcc43.patch:
--- NEW FILE LabPlot-gcc43.patch ---
diff -Nur LabPlot-1.5.1.6/src/LTable.cc.orig LabPlot-1.5.1.6/src/LTable.cc
--- LabPlot-1.5.1.6/src/LTable.cc.orig 2008-04-08 21:44:52.000000000 +0200
+++ LabPlot-1.5.1.6/src/LTable.cc 2008-04-08 21:45:19.000000000 +0200
@@ -1,6 +1,7 @@
// LabPlot : LTable.cc
#include <qpainter.h>
+#include <malloc.h>
#include <kdebug.h>
#include "LTable.h"
Index: LabPlot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/LabPlot/devel/LabPlot.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- LabPlot.spec 21 Feb 2008 19:52:42 -0000 1.8
+++ LabPlot.spec 4 Jun 2008 12:07:44 -0000 1.9
@@ -1,6 +1,6 @@
Name: LabPlot
-Version: 1.6.0
-Release: 1%{?dist}
+Version: 1.5.1.6
+Release: 6%{?dist}
Summary: Data Analysis and Visualization
License: GPLv2+
@@ -10,20 +10,17 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: http://downloads.sourceforge.net/labplot/%{name}-%{version}.tar.bz2
-BuildRequires: kdelibs-devel libselinux-devel desktop-file-utils libexif-devel netcdf-devel
+Patch0: LabPlot-gcc43.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 hdf5-devel R-devel qhull-devel koffice-devel
-
-Requires(post): R
-Requires(postun): R
-
-#LabPlot is part of the Fedora Electronic Lab collection
-#LabPlot is not an Education package but engineering
-Requires: electronics-menu
+BuildRequires: liborigin-devel
ExcludeArch: ppc64
+Requires: electronics-menu
+
%description
LabPlot is for scientific 2D and 3D data and function plotting.
The various display and analysis functions are explained in the
@@ -115,6 +112,8 @@
%prep
%setup -q
+%patch0 -p1 -b .orig
+
%{__sed} -i.system-wide -e 's|\.\./liborigin/libLabPlotorigin.la||' src/Makefile.in
%{__sed} -i -e '/^libLabPlot_la_LDFLAGS/s|^\(.*\) \\$|\1 -lorigin \\|' src/Makefile.in
%{__sed} -i -e 's|-I../liborigin|-I%{_includedir}/liborigin|' src/Makefile.in
@@ -131,7 +130,6 @@
echo "done"
done
set -x
-%{__sed} -i "s|Terminal=yes|Terminal=false|" src/%{name}.desktop
%build
# for netcdf
@@ -140,8 +138,6 @@
# for qwtplot3d
export QWT3D_PATH="$QTDIR"
-export R_HOME=%{_libdir}/R/
-export KEXIDB_DIR=%{_prefix}
# Use of --enable-final: The gsl version 1.7 has a bug which may cause problems.
%configure \
@@ -158,8 +154,7 @@
--enable-gl \
--enable-system-qwtplot3d \
--enable-libundo \
- --enable-qhull
-
+ --with-qt-librairies=%{_libdir}/qt3
# clean unused-direct-shlib-dependencies
sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
@@ -176,10 +171,7 @@
desktop-file-install --vendor fedora \
--delete-original \
--remove-category Education \
- --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
@@ -188,7 +180,7 @@
#Building pdf handbook for different languages
pushd doc
for LANG in * ; do
- if [ -d $LANG -a $LANG != Scripting -a $LANG != small_pics -a $LANG != html -a $LANG != fr ]; then
+ if [ -d $LANG -a $LANG != small_pics -a $LANG != html -a $LANG != fr ]; then
echo "[Fedora-%{name}] building pdf handbook for %{name}-%{version} (language $LANG) ..."
%{__mkdir} tmp/
@@ -271,7 +263,6 @@
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
update-desktop-database &> /dev/null ||:
-%{_R_make_search_index}
%postun
@@ -279,7 +270,6 @@
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
update-desktop-database &> /dev/null ||:
-%{_R_make_search_index}
%files -f %{name}.lang
@@ -296,7 +286,7 @@
%{_datadir}/apps/%{name}/
%{_datadir}/icons/??color/??x??/apps/%{name}.png
%{_datadir}/icons/??color/??x??/mimetypes/lpl.png
-%{_datadir}/mimelnk/application/x-l?l.desktop
+%{_datadir}/mimelnk/application/x-lpl.desktop
%{_libdir}/lib%{name}.so.1*
%{_libdir}/lib%{name}cephes.so.1*
# needed on Help -> LabPlot Handbook
@@ -352,11 +342,10 @@
%Changelog
-* Sun Dec 30 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.6.0-1
-- New upstream release
-- added hdf5-devel, qhull-devel and R-devel as BR
-- full liborigin 7.5 support
-- kexi support through koffice-devel as BR
+* Sun Apr 12 2008 Thibault North <tnorth [AT] fedoraproject DOT org> - 1.5.1.6-6
+- Fixes for GCC 4.3
+- Updated dependencies
+- Now requires electronics-menu
* Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.5.1.6-4
- complying to freedesktop policies - categories
More information about the fedora-extras-commits
mailing list