rpms/LabPlot/devel LabPlot.spec,1.7,1.8

[Chitlesh GOORAH (chitlesh)]

Author: chitlesh

Update of /cvs/pkgs/rpms/LabPlot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9401/devel

Modified Files:
	LabPlot.spec 
Log Message:



Index: LabPlot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/LabPlot/devel/LabPlot.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- LabPlot.spec	18 Feb 2008 22:35:19 -0000	1.7
+++ LabPlot.spec	21 Feb 2008 19:52:42 -0000	1.8
@@ -1,6 +1,6 @@
 Name:              LabPlot
-Version:           1.5.1.6
-Release:           5%{?dist}
+Version:           1.6.0
+Release:           1%{?dist}
 Summary:           Data Analysis and Visualization
 
 License:           GPLv2+
@@ -13,7 +13,14 @@
 BuildRequires:     kdelibs-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
+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
 
 ExcludeArch:       ppc64
 
@@ -124,6 +131,7 @@
    echo "done"
 done
 set -x
+%{__sed} -i "s|Terminal=yes|Terminal=false|" src/%{name}.desktop
 
 %build
 # for netcdf
@@ -132,6 +140,8 @@
 
 # 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             \
@@ -148,6 +158,7 @@
   --enable-gl          \
   --enable-system-qwtplot3d \
   --enable-libundo     \
+  --enable-qhull
 
 
 # clean unused-direct-shlib-dependencies
@@ -165,6 +176,10 @@
 desktop-file-install --vendor fedora           \
     --delete-original                          \
     --remove-category Education                \
+    --remove-category Science                  \
+    --remove-category Physics                  \
+    --remove-category Math                     \
+    --add-category    Electronics              \
     --dir %{buildroot}%{_datadir}/applications \
     %{buildroot}%{_datadir}/applications/kde/%{name}.desktop
 
@@ -173,7 +188,7 @@
 #Building pdf handbook for different languages
 pushd doc
 for LANG in * ; do
-  if [ -d $LANG -a $LANG != small_pics -a $LANG != html -a $LANG != fr ]; then
+  if [ -d $LANG -a $LANG != Scripting -a $LANG != small_pics -a $LANG != html -a $LANG != fr ]; then
     echo "[Fedora-%{name}] building pdf handbook for %{name}-%{version} (language $LANG) ..."
 
     %{__mkdir} tmp/
@@ -256,6 +271,7 @@
 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
@@ -263,6 +279,7 @@
 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
@@ -279,7 +296,7 @@
 %{_datadir}/apps/%{name}/
 %{_datadir}/icons/??color/??x??/apps/%{name}.png
 %{_datadir}/icons/??color/??x??/mimetypes/lpl.png
-%{_datadir}/mimelnk/application/x-lpl.desktop
+%{_datadir}/mimelnk/application/x-l?l.desktop
 %{_libdir}/lib%{name}.so.1*
 %{_libdir}/lib%{name}cephes.so.1*
 # needed on Help -> LabPlot Handbook
@@ -335,6 +352,12 @@
 
 
 %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
+
 * Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.5.1.6-4
 - complying to freedesktop policies - categories
 - queued for mass rebuild for Fedora 8 - BuildID