rpms/gnuplot/devel gnuplot-4.2.0-ver.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 gnuplot.spec, 1.34, 1.35 sources, 1.6, 1.7 gnuplot-4.0.0-x11segv.patch, 1.1, NONE

[Ivana Varekova (varekova)]

Author: varekova

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

Modified Files:
	.cvsignore gnuplot.spec sources 
Added Files:
	gnuplot-4.2.0-ver.patch 
Removed Files:
	gnuplot-4.0.0-x11segv.patch 
Log Message:
- Resolves: #231205
  update to 4.2.0
  spec changes from Tim Orling 


gnuplot-4.2.0-ver.patch:

--- NEW FILE gnuplot-4.2.0-ver.patch ---
--- gnuplot-4.2.0/docs/psdoc/Makefile.pom	2002-12-16 15:17:52.000000000 +0100
+++ gnuplot-4.2.0/docs/psdoc/Makefile	2007-05-21 12:39:03.000000000 +0200
@@ -2,7 +2,7 @@
 # Create ps_symbols.ps
 #
 
-top_srcdir = ../..
+top_srcdir = 
 
 all: ps_symbols.ps ps_fontfile_doc.ps
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnuplot/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	9 Sep 2004 05:46:41 -0000	1.6
+++ .cvsignore	21 May 2007 10:52:05 -0000	1.7
@@ -1 +1 @@
-gnuplot-4.0.0.tar.gz
+gnuplot-4.2.0.tar.gz


Index: gnuplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnuplot/devel/gnuplot.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- gnuplot.spec	26 Mar 2007 08:28:04 -0000	1.34
+++ gnuplot.spec	21 May 2007 10:52:05 -0000	1.35
@@ -1,16 +1,21 @@
+%define major 4
+%define minor 2
+%define patchlevel 0
+
 Summary: A program for plotting mathematical expressions and data
 Name: gnuplot
-Version: 4.0.0
-Release: 18%{?dist}
+Version: %{major}.%{minor}.%{patchlevel}
+Release: 1%{?dist}
 License: distributable
 # Modifications are to be distributed as patches to the released version.
 Group: Applications/Engineering
-Source: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source2: gnuplot-init.el
-Patch0: gnuplot-4.0.0-x11segv.patch
 Patch1: gnuplot-4.0.0-refers_to.patch
+Patch2: gnuplot-4.2.0-ver.patch
 BuildRequires: libpng-devel, tetex-latex, zlib-devel, libX11-devel, emacs
 BuildRequires: texinfo, readline-devel, libXt-devel, gd-devel
+Requires: latex2html
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.gnuplot.info/
 
@@ -34,16 +39,15 @@
 
 %prep
 %setup -q
-%patch0 -p 1 -b .x11segv
 %patch1 -p1 -b .refto
+%patch2 -p1 -b .ver
 
 %build
 %configure --with-readline=gnu --with-png --without-linux-vga \
  --enable-history-file
 
-make %{?_smp_mflags}
+make %{?_smp_mflags} RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
 
-rm demo/webify.pl
 cd docs
 make html
 cd psdoc
@@ -69,16 +73,21 @@
 
 %files
 %defattr(-,root,root,-)
-%doc BUGS ChangeLog Copyright FAQ NEWS README TODO docs/gnuplot.html 
+%doc BUGS ChangeLog Copyright FAQ NEWS README TODO 
+#docs/gnuplot.html 
 %doc docs/psdoc/ps_guide.ps docs/psdoc/ps_symbols.gpi tutorial/tutorial.dvi demo
 %dir %{_libexecdir}/gnuplot
-%dir %{_libexecdir}/gnuplot/4.0
-%{_libexecdir}/gnuplot/4.0/gnuplot_x11
+%dir %{_libexecdir}/gnuplot/%{major}.%{minor}
+%{_libexecdir}/gnuplot/%{major}.%{minor}/gnuplot_x11
 %{_bindir}/gnuplot
 %{_mandir}/man1/gnuplot.1.gz
 %dir %{_datadir}/gnuplot
-%dir %{_datadir}/gnuplot/4.0
-%{_datadir}/gnuplot/4.0/gnuplot.gih
+%dir %{_datadir}/gnuplot/%{major}.%{minor}
+%dir %{_datadir}/gnuplot/%{major}.%{minor}/PostScript
+%{_datadir}/gnuplot/%{major}.%{minor}/PostScript/*.ps
+%{_datadir}/gnuplot/%{major}.%{minor}/gnuplot.gih
+%{_datadir}/texmf/tex/latex/gnuplot/gnuplot.cfg
+%{_libdir}/X11/app-defaults/Gnuplot.app-defaults
 %{_infodir}/gnuplot.info.gz
 
 %files emacs
@@ -93,6 +102,11 @@
 
 
 %changelog
+* Mon May 21 2007 Ivana Varekova <varekova at redhat.com> - 4.2.0-1
+- Resolves: #231205
+  update to 4.2.0
+  spec changes from Tim Orling  
+
 * Mon Mar 26 2007 Ivana Varekova <varekova at redhat.com> - 4.0.0-18
 - add missing directories (#233838)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnuplot/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	9 Sep 2004 05:46:41 -0000	1.6
+++ sources	21 May 2007 10:52:05 -0000	1.7
@@ -1 +1 @@
-66258443d9f93cc4f46b147dac33e63a  gnuplot-4.0.0.tar.gz
+f688a578ddb4c376fd7d91ce444a0745  gnuplot-4.2.0.tar.gz


--- gnuplot-4.0.0-x11segv.patch DELETED ---