diff --git a/LabPlot-gcc43.patch b/LabPlot-gcc43.patch new file mode 100644 index 0000000..3315d6b --- /dev/null +++ b/LabPlot-gcc43.patch @@ -0,0 +1,11 @@ +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 ++#include + #include + #include "LTable.h" + diff --git a/LabPlot.spec b/LabPlot.spec index 649e22a..25a01ce 100644 --- a/LabPlot.spec +++ b/LabPlot.spec @@ -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 @@ URL: http://labplot.sourceforge.net/ 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 @@ a Data Analysis and Visualization software in the PDF format. %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 @@ for f in `find . -name \*.map -or -name \*.MAP | sort` ; do echo "done" done set -x -%{__sed} -i "s|Terminal=yes|Terminal=false|" src/%{name}.desktop %build # for netcdf @@ -140,8 +138,6 @@ export LDFLAGS="$LDFLAGS -L%{_libdir}/netcdf-3" # 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 @@ export KEXIDB_DIR=%{_prefix} --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 @@ sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool 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 @@ desktop-file-install --vendor fedora \ #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 @@ done 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 @@ update-desktop-database &> /dev/null ||: 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 @@ update-desktop-database &> /dev/null ||: %{_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 @@ update-desktop-database &> /dev/null ||: %Changelog -* Sun Dec 30 2007 Chitlesh Goorah - 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 - 1.5.1.6-6 +- Fixes for GCC 4.3 +- Updated dependencies +- Now requires electronics-menu * Thu Aug 23 2007 Chitlesh Goorah - 1.5.1.6-4 - complying to freedesktop policies - categories