- BR: ac 2.59-9 for AC_PATH_XTRA not requiring libXt

[packages/gnuplot.git] / gnuplot.spec

diff --git a/gnuplot.spec b/gnuplot.spec
index fa174408026ad64a08e0bb047c8f9459d082410c..88918de7e71875bd03c656ddac9a0e2f12bc2a13 100644 (file)
--- a/gnuplot.spec
+++ b/gnuplot.spec
@@ -1,3 +1,7 @@
+#
+# Conditional build:
+%bcond_without pdf     # don't use pdflib
+#
 Summary:       A program for plotting mathematical expressions and data
 Summary(de):   GNU-Plotter-Paket
 Summary(es):   Paquete para trazar gráficos
@@ -8,27 +12,30 @@ Summary(ru): 
 Summary(tr):   Matematiksel görselleþtirme paketi
 Summary(uk):   ðÒÏÇÒÁÍÁ ÄÌÑ ÐÏÂÕÄÏ×É ÇÒÁÆ¦Ë¦× ÍÁÔÅÍÁÔÉÞÎÉÈ ×ÉÒÁÚ¦× ÔÁ ÄÁÎÉÈ
 Name:          gnuplot
-Version:       3.8j.0
-Release:       2
-License:       GPL
+Version:       4.0.0
+Release:       5
+License:       distributable (with modifications properly marked if any)
 Group:         Applications/Math
 Source0:       http://dl.sourceforge.net/gnuplot/%{name}-%{version}.tar.gz
-# Source0-md5: 929e210e2d6585d34b029fa59d39915f
+# Source0-md5: 66258443d9f93cc4f46b147dac33e63a
 Source1:       %{name}.desktop
 Source2:       %{name}.png
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-info_install.patch
 Patch2:                %{name}-no_lisp.patch
 URL:           http://gnuplot.sourceforge.net/
-BuildRequires: XFree86-devel
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.59-9
 BuildRequires: automake
-BuildRequires: libpng >= 1.0.8
+BuildRequires: gd-devel
+BuildRequires: libpng-devel >= 1.0.8
 BuildRequires: libtool
 BuildRequires: ncurses-devel
+%{?with_pdf:BuildRequires:     pdflib-devel}
 BuildRequires: readline-devel
-BuildRequires: zlib-devel
+BuildRequires: texinfo
 #BuildRequires:        xemacs-lisp-programming
+BuildRequires: xorg-lib-libX11-devel
+BuildRequires: zlib-devel
 #or --without-lisp-files
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -83,7 +90,6 @@ Gnuplot - 
 %patch2 -p1
 
 %build
-rm -f missing
 %{__libtoolize}
 %{__aclocal} -I m4
 %{__autoheader}
@@ -92,11 +98,13 @@ rm -f missing
 
 %configure \
        --with-readline=gnu \
+       --enable-history-file \
        --with-png \
-       --without-gd \
+       --with-gd \
        --with-x \
        --without-lisp-files \
        --without-linux-vga \
+       %{!?with_pdf:--without-pdf} \
        --without-tutorial
 
 # The source tarball incorrectly includes a file that should not be there.
@@ -108,10 +116,9 @@ makeinfo gnuplot.texi
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_infodir},%{_applnkdir}/Scientific/Plotting} \
-       $RPM_BUILD_ROOT%{_pixmapsdir}
+install -d $RPM_BUILD_ROOT{%{_infodir},%{_desktopdir},%{_pixmapsdir}}
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Scientific/Plotting
+install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
 
 %{__make} install \
@@ -133,5 +140,5 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 %{_datadir}/%{name}
 %{_infodir}/gnuplot*
-%{_applnkdir}/Scientific/Plotting/*
+%{_desktopdir}/*.desktop
 %{_pixmapsdir}/*