rpms/pgplot/devel cpgplot.pc, NONE, 1.1 pgplot-pkgIndex.tcl, NONE, 1.1 pgplot.pc, NONE, 1.1 pgplot.spec, NONE, 1.1 pgplot5.2-fsstnd.patch, NONE, 1.1 pgplot5.2-g77_gcc_conf.patch, NONE, 1.1 pgplot5.2-makefile.patch, NONE, 1.1 pgplot5.2-pngdriver2.patch, NONE, 1.1 pgplot5.2-tclpackage.patch, NONE, 1.1 tk-pgplot.pc, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Thu Nov 13 11:30:54 CET 2008

Author: sergiopr

Update of /cvs/nonfree/rpms/pgplot/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30859/devel

Modified Files:
	.cvsignore sources 
Added Files:
	cpgplot.pc pgplot-pkgIndex.tcl pgplot.pc pgplot.spec 
	pgplot5.2-fsstnd.patch pgplot5.2-g77_gcc_conf.patch 
	pgplot5.2-makefile.patch pgplot5.2-pngdriver2.patch 
	pgplot5.2-tclpackage.patch tk-pgplot.pc 
Log Message:
Importing pgplot in devel

--- NEW FILE cpgplot.pc ---
prefix=/usr
exec_prefix=/usr
libdir=archlibdir
includedir=/usr/include

Name: cpgplot
Description: C interface of pgplot
Version: 5.2.2
Requires: pgplot
Libs: -L${libdir} -lcpgplot 
Cflags: -I${includedir}


--- NEW FILE pgplot-pkgIndex.tcl ---

package ifneeded pgplot 5.2 [list load [file join "archlibdir" "libtkpgplot.so.5"]]


--- NEW FILE pgplot.pc ---
prefix=/usr
exec_prefix=/usr
libdir=archlibdir
includedir=/usr/include

Name: pgplot
Description: Graphic library for making simple scientific graphs
Version: 5.2.2
Libs: -L${libdir} -lpgplot -lgfortran -lm -lX11 -lpng
#Cflags: -I${includedir}


--- NEW FILE pgplot.spec ---
%{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
%{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
Name: pgplot 
%define lvmajor 5
Version: 5.2.2
Release: 26%{?dist}
Summary: Graphic library for making simple scientific graphs

Group: Development/Libraries
License: freely available for non-commercial use

URL: http://www.astro.caltech.edu/~tjp/pgplot
Source0: ftp://ftp.astro.caltech.edu/pub/pgplot/pgplot5.2.tar.gz
Source1: pgplot.pc
Source2: cpgplot.pc
Source3: tk-pgplot.pc
Source4: pgplot-pkgIndex.tcl

# Make pgplot find files in standard locations such as
# /usr/libexec/pgplot and /usr/share/pgplot
Patch0: pgplot5.2-fsstnd.patch
# Fix the location of perl 
Patch1: pgplot5.2-makefile.patch
# make the compiler script accept FFLAGS and FC
Patch2: pgplot5.2-g77_gcc_conf.patch
# Needed by the png driver
Patch3: pgplot5.2-pngdriver2.patch
# Needed to have a loadable tcl package
Patch4: pgplot5.2-tclpackage.patch

Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires: libpng-devel tk-devel libX11-devel gcc-gfortran
BuildRequires: perl texlive-latex glibc-common

Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig

%description
The PGPLOT Graphics Subroutine Library is a Fortran- or C-callable, 
device-independent graphics package for making simple scientific graphs. 
It is intended for making graphical images of publication quality with 
minimum effort on the part of the user. For most applications, 
the program can be device-independent, and the output can be directed to 
the appropriate device at run time.

%package devel
Summary: Libraries, includes, etc. used to develop an application with %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: libX11-devel libpng-devel pkgconfig

%description devel
These are the header files and static libraries needed to develop a %{name} 
application.

%package demos
Summary: Demo applications of %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description demos
Demonstration applications for PGPLOT, a FORTRAN-callable,
device-independent graphics package for making simple scientific graphs.

%package -n tcl-%{name}
Summary: Tcl/Tk driver for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: tcl(abi) = 8.5 
Provides: tk-%{name} = %{version}-%{release}

%description -n tcl-%{name}
Tcl/Tk driver for %{name}

%package -n tcl-%{name}-devel
Summary: Tcl/Tk driver for %{name} devel files 
Group: Development/Libraries
Requires: tcl-%{name} = %{version}-%{release}
Requires: %{name}-devel = %{version}-%{release}
Requires: tk-devel
Provides: tk-%{name}-devel = %{version}-%{release}

%description -n tcl-%{name}-devel
Libraries, includes, etc. used to develop an application using
the %{name} Tcl/Tk driver.

%prep
%setup -q -n %{name}

%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1

%{__cp} %{SOURCE1} .
%{__cp} %{SOURCE2} .
%{__cp} %{SOURCE3} .
%{__cp} %{SOURCE4} pkgIndex.tcl

# Enabling the following drivers:
# PNG, PS, PPM, TCL/TK and X
%{__sed} \
-e 's/! PNDRIV/  PNDRIV/g' \
-e 's/! PSDRIV/  PSDRIV/g' \
-e 's/! PPDRIV/  PPDRIV/g' \
-e 's/! XWDRIV/  XWDRIV/g' \
-e 's/! TKDRIV/  TKDRIV/g' -i drivers.list

# This version of fedora includes gcc-fedora 4.3 
# that can compile the GIF driver
%if 0%{?fedora} >= 9
%{__sed} -e 's/! GIDRIV/  GIDRIV/g' -i drivers.list
%endif

# Creating pkgconfig files from templates
%{__sed} -e 's|archlibdir|%{_libdir}|g' -i pgplot.pc
%{__sed} -e 's|archlibdir|%{_libdir}|g' -i cpgplot.pc
%{__sed} -e 's|archlibdir|%{_libdir}|g' -i tk-pgplot.pc
%{__sed} -e 's|archlibdir|%{_libdir}|g' -i pkgIndex.tcl

# Version files stored in one Changelog
(for i in $(find . -name "ver*.txt" |sort -r); do iconv -f "ISO-8859-1" -t "utf8" $i; done) > ChangeLog

%build
./makemake . linux g77_gcc
# Parallel make not supported
%{__make} FC=f95 CC=%{__cc} CFLAGS="%{optflags}" FFLAGS="%{optflags}" \
   NLIBS="-lgfortran -lm -lX11 -lpng"

# Creating dynamic library for C
%{__make}  %{?_smp_mflags} \
   FC=f95 CC=%{__cc} CFLAGS="%{optflags}" FFLAGS="%{optflags}" cpg
%{__ar} x libcpgplot.a
%{__cc} %{optflags} -shared -o libc%{name}.so.%{version} \
    -Wl,-soname,libc%{name}.so.%{lvmajor} \
    cpg*.o -L . -l%{name} -lgfortran -lm -lX11 -lpng

# Creating dynamic library for TK
%{__ar} x libtkpgplot.a
%{__cc} %{optflags} -shared -o libtk%{name}.so.%{version} \
    -Wl,-soname,libtk%{name}.so.%{lvmajor} \
    tkpgplot.o -L . -l%{name} -ltk -ltcl -lX11 

for i in lib*.so.%{version}; do
  chmod 755 $i
done

%{__ln_s} lib%{name}.so.%{version} lib%{name}.so.%{lvmajor}
%{__ln_s} lib%{name}.so.%{version} lib%{name}.so
%{__ln_s} libc%{name}.so.%{version} libc%{name}.so.%{lvmajor}
%{__ln_s} libc%{name}.so.%{version} libc%{name}.so
%{__ln_s} libtk%{name}.so.%{version} libtk%{name}.so.%{lvmajor}
%{__ln_s} libtk%{name}.so.%{version} libtk%{name}.so

%{__make} %{?_smp_mflags} pgplot-routines.tex
%{__make} %{?_smp_mflags} pgplot.html
pdflatex pgplot-routines.tex

%install
%{__rm} -rf %{buildroot}
%{__mkdir_p} %{buildroot}/%{_bindir}
%{__mkdir_p} %{buildroot}/%{_libdir}/pkgconfig
%{__mkdir_p} %{buildroot}/%{_includedir}
%{__mkdir_p} %{buildroot}/%{_datadir}/%{name}
%{__mkdir_p} %{buildroot}/%{_libexecdir}/%{name}
%{__mkdir_p} %{buildroot}/%{tcl_sitearch}/%{name}
%{__cp} -a  lib*%{name}.so* %{buildroot}/%{_libdir}
%{__install} -p -m 644 cpgplot.h %{buildroot}/%{_includedir}
%{__install} -p -m 644 tkpgplot.h %{buildroot}/%{_includedir}
%{__install} -p -m 644 rgb.txt %{buildroot}/%{_datadir}/%{name}
%{__install} -p -m 644 grfont.dat %{buildroot}/%{_datadir}/%{name}
%{__install} -p -m 755 pgxwin_server %{buildroot}/%{_libexecdir}/%{name}
%{__install} -p -m 755 pgdemo* cpgdemo %{buildroot}/%{_bindir}
%{__install} -p -m 644 *.pc %{buildroot}/%{_libdir}/pkgconfig
%{__install} -p -m 644 pkgIndex.tcl %{buildroot}/%{tcl_sitearch}/%{name}

%clean
%{__rm} -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%post -n tcl-%{name} -p /sbin/ldconfig

%postun -n tcl-%{name} -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc copyright.notice ChangeLog
%{_libdir}/lib%{name}.so.*
%{_libdir}/libc%{name}.so.*
%{_datadir}/%{name}
%{_libexecdir}/%{name}

%files devel
%defattr (-,root,root,-)
%doc aaaread.me pgplot-routines.pdf pgplot.html copyright.notice
%{_libdir}/lib%{name}.so
%{_libdir}/libc%{name}.so
%{_includedir}/cpgplot.h
%{_libdir}/pkgconfig/pgplot.pc
%{_libdir}/pkgconfig/cpgplot.pc

%files -n tcl-%{name}
%defattr (-,root,root,-)
%doc copyright.notice
%{_libdir}/libtk%{name}.so.*
%{tcl_sitearch}/%{name}

%files -n tcl-%{name}-devel
%defattr (-,root,root,-)
%doc copyright.notice
%{_libdir}/libtk%{name}.so
%{_includedir}/tkpgplot.h
%{_libdir}/pkgconfig/tk-pgplot.pc

%files demos
%defattr (-,root,root,-)
%doc copyright.notice
%{_bindir}/*

%changelog
* Thu Nov 13 2008 Sergio Pascual <spr at astrax.fis.ucm.es> 5.2.2-26
- Provides includes release

* Wed Nov 12 2008 Sergio Pascual <spr at astrax.fis.ucm.es> 5.2.2-25
- Fixed non-standard-executable-perm in libcpgplot and libtkpgplot
- Included version files in one Changelog
- Parallel make works only with make cpg
- Removed macro lvfull, using version instead
- copyright.notice in all subpackages
- Patched tk driver to have a loadable package
- Tk driver follows tcl guidelines

* Sun Nov 09 2008 Sergio Pascual <spr at astrax.fis.ucm.es> 5.2.2-24
- Using sed to enable the drivers instead of patch
- Removed docs package
- Added pkgconfig files
- Package tcl renamed as tk
- Create pdf doc from latex routines description

* Wed Nov 05 2008 Sergio Pascual <spr at astrax.fis.ucm.es> 5.2.2-23
- Fixing weak symbols in libcpgplot
- Poststages for libtkpgplot
- pgplot-tcl-devel requires pgplot-tcl

* Fri Jun 27 2008 Sergio Pascual <spr at astrax.fis.ucm.es> 5.2.2-22
- Spec cleanup
- Building againts el5

* Thu Jun 05 2008 Sergio Pascual <spr at astrax.fis.ucm.es> 5.2.2-21
- Readded gif
- Spec cleanup

* Thu Jun 05 2008 Sergio Pascual <spr at astrax.fis.ucm.es> 5.2.2-21
- Readded gif
- Spec cleanup

* Thu Sep 06 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 5.2.2-20
- Adding png

* Fri Jul 20 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 5.2.2-19
- Demos compiled with debug flags
- Test to compile with gfortran

* Thu Dec 14 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 5.2.2-18
- Added Tcl/Tk driver. 
- New subpackges pgplot-tcl and pgplot-tcl-devel.

* Wed Nov 01 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 5.2.2-17
- Rebuild for fc6.

* Fri Oct 13 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 5.2.2-16
- Added correct Requires in devel subpackage.

* Mon Sep 25 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 5.2.2-15
- Extra documentation added.

* Fri Jul 28 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 5.2.2-14
- New m4 macros.

* Wed Jul 26 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 5.2.2-13
- Honors FFLAGS and CFLAGS, can not be built with gfortran.
- Rebuild for FC5.

* Fri Mar 17 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 5.2.2-12
- Removed pgplot-acentos.tar.gz.

* Wed Mar 15 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 5.2.2-11
- Unpacking correctly pgplot-m4.tar.gz and pgplot-acentos.tar.gz.

* Wed Mar 15 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 5.2.2-10
- Added Requires for devel package.

* Tue Feb 21 2006 Sergio Pascual <spr at astrax.fis.ucm.es> 5.2.2-9
- Minor fixes.
- Excluded static libraries.

* Tue Nov 28 2005 Sergio Pascual <spr at astrax.fis.ucm.es> 5.2.2-8
- Adding soname to the shared libs.
- Minor fixes.

* Wed Apr 27 2005 Sergio Pascual <spr at astrax.fis.ucm.es> 5.2.2-7
- Using dist tags. Adding pgplot.m4 and grfont with accented characters.

* Wed Apr 20 2005 Sergio Pascual <spr at astrax.fis.ucm.es> 5.2.2-6
- Rebuild for FC3. Removed grfont with accented characters.

* Fri Nov 21 2003 Sergio Pascual <spr at astrax.fis.ucm.es> 5.2.2-5
- Added docs package.

* Tue Feb 25 2003 Sergio Pascual <spr at astrax.fis.ucm.es> 5.2.2-4
- Added demos.

* Thu Feb 12 2003 Sergio Pascual <spr at astrax.fis.ucm.es> 5.2.2-3
- Splited devel part.

* Tue Feb 11 2003 Nicolas Cardiel <ncl at astrax.fis.ucm.es> 5.2.2-2
- Added suport for accents.

* Mon May 27 2002 Sergio Pascual <spr at astrax.fis.ucm.es> 5.2.2-1
- Initial RPM release.

pgplot5.2-fsstnd.patch:

--- NEW FILE pgplot5.2-fsstnd.patch ---
diff -ur pgplot.orig/drivers/xwdriv.c pgplot/drivers/xwdriv.c
--- pgplot.orig/drivers/xwdriv.c	2000-12-13 02:30:18.000000000 +0100
+++ pgplot/drivers/xwdriv.c	2003-02-28 13:22:32.000000000 +0100
@@ -3344,6 +3344,7 @@
     };
 #else
     if((exe=find_exe(getenv("PGPLOT_DIR"), PGXWIN_SERVER))==NULL &&
+       (exe=find_exe("/usr/libexec/pgplot", PGXWIN_SERVER))==NULL &&
        (exe=find_exe(getenv("PATH"), PGXWIN_SERVER))==NULL) {
       fprintf(stderr,
          "%s: Couldn't find program \"%s\" in the directory named\n",
diff -ur pgplot.orig/src/grgfil.f pgplot/src/grgfil.f
--- pgplot.orig/src/grgfil.f 1995-06-14 03:23:31.000000000 +0200
+++ pgplot/src/grgfil.f    2005-04-20 16:22:43.000000000 +0200
@@ -26,7 +26,7 @@
 C  2-Dec-1994 - new routine [TJP].
 C-----------------------------------------------------------------------
       CHARACTER*(*) DEFDIR, DEFFNT, DEFRGB
-      PARAMETER  (DEFDIR='/usr/local/pgplot/')
+      PARAMETER  (DEFDIR='/usr/share/pgplot/')
       PARAMETER  (DEFFNT='grfont.dat')
       PARAMETER  (DEFRGB='rgb.txt')
       CHARACTER*255 FF

pgplot5.2-g77_gcc_conf.patch:

--- NEW FILE pgplot5.2-g77_gcc_conf.patch ---
diff -ur pgplot.old/sys_linux/g77_gcc.conf pgplot/sys_linux/g77_gcc.conf
--- pgplot.old/sys_linux/g77_gcc.conf	1999-07-05 20:10:33.000000000 +0200
+++ pgplot/sys_linux/g77_gcc.conf	2007-07-20 16:33:15.000000000 +0200
@@ -34,35 +34,35 @@
 # Mandatory.
 # The FORTRAN compiler to use.
  
-   FCOMPL="g77"
+   FCOMPL='$(FC)'
 
 # Mandatory.
 # The FORTRAN compiler flags to use when compiling the pgplot library.
 # (NB. makemake prepends -c to $FFLAGC where needed)
  
-   FFLAGC="-u -Wall -fPIC -O"
+   FFLAGC='$(FFLAGS) -fPIC'
 
 # Mandatory.
 # The FORTRAN compiler flags to use when compiling fortran demo programs.
 # This may need to include a flag to tell the compiler not to treat
 # backslash characters as C-style escape sequences
  
-   FFLAGD="-fno-backslash"
+   FFLAGD='$(FFLAGS) -fno-backslash'
 
 # Mandatory.
 # The C compiler to use.
  
-   CCOMPL="gcc"
+   CCOMPL='$(CC)'
 
 # Mandatory.
 # The C compiler flags to use when compiling the pgplot library.
  
-   CFLAGC="-Wall -fPIC -DPG_PPU -O"
+   CFLAGC='$(CFLAGS) -fPIC -DPG_PPU '
 
 # Mandatory.
 # The C compiler flags to use when compiling C demo programs.
  
-   CFLAGD="-Wall -O"
+   CFLAGD='$(CFLAGS)'
 
 # Optional: Only needed if the cpgplot library is to be compiled.
 # The flags to use when running pgbind to create the C pgplot wrapper
@@ -74,7 +74,7 @@
 # The library-specification flags to use when linking normal pgplot
 # demo programs.
  
-   LIBS="-L/usr/X11R6/lib -lX11"
+   LIBS="-lX11"
 
 # Optional: Needed by XMDRIV (/xmotif).
 # The library-specification flags to use when linking motif
@@ -92,7 +92,7 @@
 # The library-specification flags to use when linking Tk demo programs.
 # Note that you may need to append version numbers to -ltk and -ltcl.
  
-   TK_LIBS="-L/usr/lib -ltk -ltcl $LIBS -ldl"
+   TK_LIBS="-ltk -ltcl $LIBS -ldl"
 
 # Mandatory.
 # On systems that have a ranlib utility, put "ranlib" here. On other
@@ -103,12 +103,12 @@
 # Optional: Needed on systems that support shared libraries.
 # The name to give the shared pgplot library.
  
-   SHARED_LIB="libpgplot.so"
+   SHARED_LIB="libpgplot.so.5.2.2"
 
 # Optional: Needed if SHARED_LIB is set.
 # How to create a shared library from a trailing list of object files.
  
-   SHARED_LD="gcc -shared  -o $SHARED_LIB"
+   SHARED_LD='$(CC) $(CFLAGS) -shared  -Wl,-soname,libpgplot.so.5 -o libpgplot.so.5.2.2 $(NLIBS)'
 
 # Optional:
 # On systems such as Solaris 2.x, that allow specification of the

pgplot5.2-makefile.patch:

--- NEW FILE pgplot5.2-makefile.patch ---
diff -ur pgplot/makehtml pgplot.p/makehtml
--- pgplot/makehtml	1997-02-26 22:54:09.000000000 +0100
+++ pgplot.p/makehtml	2005-04-20 16:29:26.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
 
 $, = ' ';		# set output field separator
 $\ = "\n";		# set output record separator
diff -ur pgplot/maketex pgplot.p/maketex
--- pgplot/maketex	1996-04-16 23:51:24.000000000 +0200
+++ pgplot.p/maketex	2005-04-20 16:29:33.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
 
 $, = ' ';		# set output field separator
 $\ = "\n";		# set output record separator

pgplot5.2-pngdriver2.patch:

--- NEW FILE pgplot5.2-pngdriver2.patch ---
--- pgplot.orig/makemake        2005-04-20 17:11:32.000000000 +0200
+++ pgplot/makemake     2005-04-20 17:11:54.000000000 +0200
@@ -1025,7 +1025,7 @@
 grivas.o : $(DRVDIR)/gadef.h
 grtv00.o : $(DRVDIR)/imdef.h
 pgxwin.o : $(DRVDIR)/pgxwin.h
-pndriv.o : ./png.h ./pngconf.h ./zlib.h ./zconf.h
+pndriv.o :

 x2driv.o figdisp_comm.o: $(DRVDIR)/commands.h

pgplot5.2-tclpackage.patch:

--- NEW FILE pgplot5.2-tclpackage.patch ---
diff -ur pgplot/drivers/xtk/tkpgplot.c pgplot.new/drivers/xtk/tkpgplot.c
--- pgplot/drivers/xtk/tkpgplot.c	2000-12-13 03:16:28.000000000 +0100
+++ pgplot.new/drivers/xtk/tkpgplot.c	2008-11-12 11:20:41.000000000 +0100
@@ -425,6 +425,9 @@
  * Create the TCL command that is to be used for creating PGPLOT widgets.
  */
   Tcl_CreateCommand(interp, "pgplot", PgplotCmd, (ClientData) main_w, 0);
+
+  Tcl_PkgProvide(interp, "pgplot", "5.2");
+
   return TCL_OK;
 }
 


--- NEW FILE tk-pgplot.pc ---
prefix=/usr
exec_prefix=/usr
libdir=archlibdir
includedir=/usr/include

Name: tk-pgplot
Description: Tcl/Tk driver for pgplot
Version: 5.2.2
Libs: -L${libdir} -lpgplot -lgfortran -lm -lX11 -lpng
Cflags: -I${includedir}


Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/pgplot/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Nov 2008 08:03:24 -0000	1.1
+++ .cvsignore	13 Nov 2008 10:30:54 -0000	1.2
@@ -0,0 +1 @@
+pgplot5.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/pgplot/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Nov 2008 08:03:24 -0000	1.1
+++ sources	13 Nov 2008 10:30:54 -0000	1.2
@@ -0,0 +1 @@
+e8a6e8d0d5ef9d1709dfb567724525ae  pgplot5.2.tar.gz

