- 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 5fd893140fbdb387c5a8fd7deaea601bbe1ac6d0..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
@@ -9,8 +13,8 @@ Summary(tr):   Matematiksel g
 Summary(uk):   ðÒÏÇÒÁÍÁ ÄÌÑ ÐÏÂÕÄÏ×É ÇÒÁÆ¦Ë¦× ÍÁÔÅÍÁÔÉÞÎÉÈ ×ÉÒÁÚ¦× ÔÁ ÄÁÎÉÈ
 Name:          gnuplot
 Version:       4.0.0
-Release:       2
-License:       GPL
+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: 66258443d9f93cc4f46b147dac33e63a
@@ -20,18 +24,18 @@ 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: gd-devel
-BuildRequires: libpng >= 1.0.8
+BuildRequires: libpng-devel >= 1.0.8
 BuildRequires: libtool
 BuildRequires: ncurses-devel
-BuildRequires: pdflib-devel
+%{?with_pdf:BuildRequires:     pdflib-devel}
 BuildRequires: readline-devel
 BuildRequires: texinfo
-BuildRequires: zlib-devel
 #BuildRequires:        xemacs-lisp-programming
+BuildRequires: xorg-lib-libX11-devel
+BuildRequires: zlib-devel
 #or --without-lisp-files
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -86,7 +90,6 @@ Gnuplot - 
 %patch2 -p1
 
 %build
-rm -f missing
 %{__libtoolize}
 %{__aclocal} -I m4
 %{__autoheader}
@@ -101,6 +104,7 @@ rm -f missing
        --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.
@@ -136,5 +140,5 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 %{_datadir}/%{name}
 %{_infodir}/gnuplot*
-%{_desktopdir}/*
+%{_desktopdir}/*.desktop
 %{_pixmapsdir}/*