- 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 9fcb29eb531543642674421f2a94e52ef3847910..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,25 +12,30 @@ Summary(ru): 
 Summary(tr):   Matematiksel görselleþtirme paketi
 Summary(uk):   ðÒÏÇÒÁÍÁ ÄÌÑ ÐÏÂÕÄÏ×É ÇÒÁÆ¦Ë¦× ÍÁÔÅÍÁÔÉÞÎÉÈ ×ÉÒÁÚ¦× ÔÁ ÄÁÎÉÈ
 Name:          gnuplot
-Version:       3.7.2
-Release:       6
-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: 66258443d9f93cc4f46b147dac33e63a
 Source1:       %{name}.desktop
+Source2:       %{name}.png
 Patch0:                %{name}-info.patch
-Patch1:                %{name}-acfix.patch
-Patch2:                %{name}-round.patch
-Patch3:                %{name}-info_install.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)
 
@@ -79,32 +88,41 @@ Gnuplot - 
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
+%{__libtoolize}
 %{__aclocal} -I m4
-%{__autoconf}
 %{__autoheader}
+%{__autoconf}
+%{__automake}
 
 %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.
+rm -f src/getcolor_x11.*
+
 %{__make}
 cd docs
 makeinfo gnuplot.texi
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_infodir},%{_applnkdir}/Scientific/Plotting}
-install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Scientific/Plotting/%{name}.desktop
+install -d $RPM_BUILD_ROOT{%{_infodir},%{_desktopdir},%{_pixmapsdir}}
+
+install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
+install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
 
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -118,7 +136,9 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_libdir}/%{name}
 %{_mandir}/man1/*
-%{_datadir}/gnuplot.gih
+%{_datadir}/%{name}
 %{_infodir}/gnuplot*
-%{_applnkdir}/Scientific/Plotting/*
+%{_desktopdir}/*.desktop
+%{_pixmapsdir}/*