Attachment 360715 Details for Bug 604087

[patch] Patch against gnuplot.spec

gnuplot.spec.original.patch (text/plain), 3.34 KB, created by Dieter Jurzitza on 2010-05-09 18:49:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dieter Jurzitza

Created: 2010-05-09 18:49:07 UTC

Size: 3.34 KB

patch

obsolete

>--- gnuplot.spec.original	2010-05-08 14:51:08.000000000 +0200
>+++ gnuplot.spec	2010-05-09 19:34:06.000000000 +0200
>@@ -35,17 +35,18 @@
> Group:          Productivity/Graphics/Visualization/Graph
> AutoReqProv:    on
> Version:        4.4.0
>-Release:        1.23
>+Release:        1.34
> Summary:        GNUplot a Function Plotting Utility
> Source0:        gnuplot-%{version}.tar.bz2
> Source2:        gnuplot-fr.doc.bz2
> Source3:        README.whynot
>-Patch0:         gnuplot-4.4.0.dif
>-Patch1:         gnuplot-4.4.0-x11ovf.dif
>-Patch2:         gnuplot-4.4.0-fonts.dif
>-Patch3:         gnuplot-4.4.0-wxt.dif
>-Patch4:         gnuplot-4.4.0-demo.dif
>-Patch6:         gnuplot-4.2.5-fix-format-errors.dif
>+Patch0:         %{name}-%{version}.dif
>+Patch1:         %{name}-%{version}-x11ovf.dif
>+Patch2:         %{name}-%{version}-fonts.dif
>+Patch3:         %{name}-%{version}-wxt.dif
>+Patch4:         %{name}-%{version}-demo.dif
>+Patch5:         %{name}-%{version}-local.dif
>+Patch6:         %{name}-4.2.5-fix-format-errors.dif
> BuildRoot:      %{_tmppath}/%{name}-%{version}-build
> %{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)}
> %if "%_exec_prefix" == "/usr/X11R6"
>@@ -91,14 +92,14 @@
> test $? -eq 0 || exit 1
> %patch -P 1 -p 0 -b .x11ovf
> %patch -P 2 -p 0 -b .font
>-#%patch -P 3 -p 0
>+%patch -P 5 -p 0
> %patch -P 4 -p 0
> %patch -P 6 -p 0
> %patch -P 0 -p 0
> 
> %build
>     SECSVGA="-DSVGA_IS_SECURE=1"
>-    export  CPPFLAGS="-I%{_x11inc} -I%{_includedir}/gd -DAppDefDir=\\\"%{_appdef}\\\""
>+    export  CPPFLAGS="-I%{_x11inc} -I%{_includedir}/gd"
>     export  CPPFLAGS="$CPPFLAGS -DGNUPLOT_LIB_DEFAULT=\\\"%{_docdir}/%{name}/demo\\\""
>     export  CFLAGS="${RPM_OPT_FLAGS} -pipe ${SECSVGA} -D_GNU_SOURCE"
>     export  CXXFLAGS="$CFLAGS -fno-strict-aliasing"
>@@ -112,28 +113,29 @@
>     rm -f config.status config.log config.cache configure aclocal.m4
>     aclocal -I m4
>     autoconf
>-    ./configure			\
>-	--prefix=%{_prefix}		\
>-	--mandir=%{_mandir}	\
>-	--infodir=%{_infodir}	\
>-	--libexecdir=%{_libdir}	\
>-	--datadir=%{_datadir}	\
>-	--with-gcc		\
>-	--with-x		\
>-	--x-includes=%{_x11inc}	\
>-	--x-libraries=%{_x11lib}\
>-	--with-readline=gnu	\
>-	--enable-history-file	\
>-	--with-linux-vga	\
>-	--with-gif=png		\
>-	--with-freetype=%{_libdir}\
>-	--enable-x11-mbfonts	\
>-	--enable-h3d-quadtree	\
>-	--with-zlib		\
>-	--with-gd		\
>-	--enable-thin-splines	\
>-	--without-row-help	\
>-	--with-kpsexpand	\
>+    ./configure					\
>+	--prefix=%{_prefix}			\
>+	--mandir=%{_mandir}			\
>+	--infodir=%{_infodir}			\
>+	--libexecdir=%{_libdir}			\
>+	--datadir=%{_datadir}			\
>+	--with-gcc				\
>+	--with-x				\
>+	--with-x-app-defaultdir=%{_appdef} 	\
>+	--x-includes=%{_x11inc}			\
>+	--x-libraries=%{_x11lib}		\
>+	--with-readline=gnu			\
>+	--enable-history-file			\
>+	--with-linux-vga			\
>+	--with-gif=png				\
>+	--with-freetype=%{_libdir}		\
>+	--enable-x11-mbfonts			\
>+	--enable-h3d-quadtree			\
>+	--with-zlib				\
>+	--with-gd				\
>+	--enable-thin-splines			\
>+	--without-row-help			\
>+	--with-kpsexpand			\
> 	--with-plot=%{_libdir}
>     make %{?jobs:-j%jobs}
>     pushd docs/
>@@ -203,6 +205,8 @@
> %doc %{_mandir}/man1/gnuplot.1.gz
> 
> %changelog
>+* Sun May 9 2010 dieter.jurzitza@t-online.de
>+- fix AppDefDir vs. XAPPLRESDIR inconsistency, increase default number of samples.
> * Wed Apr  7 2010 werner@suse.de
> - Update to gnuplot 4.4.0
>   * NEW linetype property 'pointinterval'

Actions: View | Diff

Attachments on bug 604087: 360715 | 360716