Author: sergiopr Update of /cvs/nonfree/rpms/pgplot/EL-6 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv18465 Modified Files: README.fedora pgplot.spec Log Message: * Thu May 21 2013 Sergio Pascual <sergio.pasra(a)gmail.com&gt; - 5.2.2-34.1 - Readded PNG driver, it works in EPEL6 Index: README.fedora =================================================================== RCS file: /cvs/nonfree/rpms/pgplot/EL-6/README.fedora,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- README.fedora 12 Feb 2012 14:43:46 -0000 1.1 +++ README.fedora 21 May 2013 08:58:40 -0000 1.2 @@ -1,6 +1,3 @@ The following drivers are enabled: -PS, TCL/TK, X, GIF and PPM - -PNG is disabled due to the incompatibility between the supported version (1.2.x) -and the library in Fedora (1.5.x). Patches are welcomed to overcome this problem +PNG, PS, TCL/TK, X, GIF and PPM Index: pgplot.spec =================================================================== RCS file: /cvs/nonfree/rpms/pgplot/EL-6/pgplot.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- pgplot.spec 8 Mar 2012 17:00:40 -0000 1.9 +++ pgplot.spec 21 May 2013 08:58:40 -0000 1.10 @@ -3,7 +3,7 @@ Name: pgplot %define lvmajor 5 Version: 5.2.2 -Release: 34%{?dist} +Release: 34%{?dist}.1 Summary: Graphic library for making simple scientific graphs Group: Development/Libraries @@ -24,12 +24,12 @@ Patch1: pgplot5.2-makefile.patch # make the compiler script accept FFLAGS and FC Patch2: pgplot5.2-g77_gcc_conf.patch -# Needed by the (disabled) png driver +# Needed by the png driver Patch3: pgplot5.2-pngdriver.patch # Needed to have a loadable tcl package Patch4: pgplot5.2-tclpackage.patch -BuildRequires: tk-devel libX11-devel gcc-gfortran +BuildRequires: tk-devel libX11-devel gcc-gfortran libpng-devel BuildRequires: perl Requires(post): /sbin/ldconfig @@ -89,8 +89,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 -# PNG disabled -#%patch3 -p1 +%patch3 -p1 %patch4 -p1 cp %{SOURCE1} . @@ -100,8 +99,9 @@ cp %{SOURCE5} . # Enabling the following drivers: -# PS, TCL/TK and X +# PNG PS, TCL/TK and X %{__sed} \ +-e 's/! PNDRIV/ PNDRIV/g' \ -e 's/! PSDRIV/ PSDRIV/g' \ -e 's/! XWDRIV/ XWDRIV/g' \ -e 's/! TKDRIV/ TKDRIV/g' -i drivers.list @@ -214,6 +214,9 @@ %{_bindir}/* %changelog +* Thu May 21 2013 Sergio Pascual <sergio.pasra(a)gmail.com&gt; - 5.2.2-34.1 +- Readded PNG driver, it works in EPEL6 + * Thu Mar 08 2012 Sergio Pascual <sergio.pasra(a)gmail.com&gt; - 5.2.2-34 - EVR bump for rebuild