* gnuplot: new upstream release

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@8194 ec354946-7b23-47d6-9f5a-488ba84defc7

g/gnuplot/gnuplot-vl.spec

@@ -1,11 +1,11 @@
-%define gpmainver 4.4
-%define gpver %{gpmainver}.3
+%define gpmainver 4.6
+%define gpver %{gpmainver}.4
 
 Summary: A program for plotting mathematical expressions and data.
 Summary(ja):  数学系の関数やデータのプロット・プログラム
 Name: gnuplot
 Version: %{gpver}
-Release: 2%{?_dist_release}
+Release: 1%{?_dist_release}
 
 License: gnuplot and GPLv2
 Group: Applications/Engineering
@@ -13,6 +13,13 @@ URL: http://gnuplot.sourceforge.net/
 
 Source: http://prdownloads.sourceforge.net/gnuplot/gnuplot-%{version}.tar.gz
 
+Patch0: gnuplot-4.6.4-font.patch
+# submitted upstream: http://sourceforge.net/tracker/?func=detail&aid=3558970&group_id=2055&atid=302055
+Patch1: gnuplot-4.6.1-xcopygc-sigsegv.patch
+# submitted upstream: http://sourceforge.net/tracker/?func=detail&aid=3558973&group_id=2055&atid=302055
+Patch2: gnuplot-4.6.1-plot-sigsegv.patch
+
+
 BuildRoot: %{_tmppath}/%{name}-root
 BuildRequires: gd-devel >= 2.0.27, libpng-devel, zlib-devel
 BuildRequires: libX11-devel, libXt-devel, wxGTK-devel
@@ -23,13 +30,14 @@ BuildRequires: libXpm-devel libjpeg-turbo-devel
 BuildRequires: texlive
 BuildRequires: texlive-common
 BuildRequires: texlive-collection-latexextra
+BuildRequires: texlive-collection-htmlxml
 BuildRequires: texinfo, emacsen
 Requires(post): install-info
 Requires(preun): install-info
 
 Vendor: Project Vine
 Distribution: Vine Linux
-Packager: daisuke, inagaki
+Packager: daisuke, inagaki, shaolin
 
 %description
 Gnuplot is a command-line driven, interactive function plotting
@@ -51,34 +59,43 @@ Gnuplotは関数や座標データを同時にプロットしたり、3次元化
 
 %prep
 %setup -q
+%patch0 -p1 -b .font
+%patch1 -p1 -b .xcopygc
+%patch2 -p1 -b .plot-sigsegv
 
 %build
 #autoreconf -f -i
 %ifarch alpha
 %define optflags -O0
 %endif
-%configure --with-readline=gnu --with-png --without-linux-vga --enable-history-file
+%configure --with-readline=gnu --with-png --without-linux-vga --enable-history-file --with-tutorial
 
 make %{?_smp_mflags}
 
+make -C docs html info
+export GNUPLOT_PS_DIR=../../term/PostScript
+make -C docs/psdoc ps_symbols.ps ps_fontfile_doc.pdf
+rm -rf docs/htmldocs/images.idx
+make -C tutorial
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
+make -C docs install-info DESTDIR=%{buildroot} INSTALL='install -p'
 
 rm -f demo/Makefile* tutorial/Makefile*
 
 # move app-dafaults to %%_datadir
-#mv $RPM_BUILD_ROOT%{_libdir}/X11 $RPM_BUILD_ROOT%{_datadir}/
+#mv %{buildroot}%{_libdir}/X11 %{buildroot}%{_datadir}/
 
 # move texmf config
-mv $RPM_BUILD_ROOT%{_datadir}/texmf-local $RPM_BUILD_ROOT%{_datadir}/texmf
+#mv %{buildroot}%{_datadir}/texmf-local %{buildroot}%{_datadir}/texmf
 
 # remove unneeded files
-rm -f $RPM_BUILD_ROOT%{_infodir}/dir
+rm -f %{buildroot}%{_infodir}/dir
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post
 /sbin/install-info --quiet --info-dir=%{_infodir} %{_infodir}/gnuplot.info.gz
@@ -92,7 +109,7 @@ fi
 %files
 %defattr(-,root,root)
 %doc demo tutorial
-%doc README README.1ST INSTALL Copyright TODO
+%doc README README.1ST INSTALL Copyright
 %doc PATCHLEVEL VERSION BUGS ChangeLog 
 %{_bindir}/gnuplot
 %{_libexecdir}/gnuplot/%{gpmainver}/*
@@ -104,6 +121,11 @@ fi
 %{_mandir}/man1/gnuplot.*
 
 %changelog
+* Thu Jan 16 2014 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 4.6.4-1
+- new upstream release
+- add Patch0, Patch1 and Patch2 (font paths, upstream fixes)
+- modify spec to build/install docs correctly
+
 * Wed Jul 11 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> - 4.4.3-2
 - changed BuildRequires: wx-gtk2-devel >= 2.8.12 to wxGTK-devel >= 2.8.12
 - added BuildRequires: libXpm-devel libjpeg-turbo-devel texlive-common