rpms/plplot/devel plplot-5.5.3-buffer.patch, NONE, 1.1 plplot-5.5.3-matwrap.patch, NONE, 1.1 plplot-5.5.3-tk.patch, NONE, 1.1 plplot.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Orion Poplawski (orion)
fedora-extras-commits at redhat.com
Wed Aug 10 17:15:12 UTC 2005
Author: orion
Update of /cvs/extras/rpms/plplot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4473/devel
Modified Files:
.cvsignore sources
Added Files:
plplot-5.5.3-buffer.patch plplot-5.5.3-matwrap.patch
plplot-5.5.3-tk.patch plplot.spec
Log Message:
auto-import plplot-5.5.3-5 on branch devel from plplot-5.5.3-5.src.rpm
plplot-5.5.3-buffer.patch:
--- NEW FILE plplot-5.5.3-buffer.patch ---
--- plplot-5.5.3/src/plcont.c.orig 2005-08-09 10:14:34.000000000 -0600
+++ plplot-5.5.3/src/plcont.c 2005-08-09 10:15:11.000000000 -0600
@@ -295,7 +295,7 @@
static void plfloatlabel(PLFLT value, char *string)
{
PLINT setpre, precis;
- char form[10], tmpstring[10];
+ char form[10], tmpstring[20];
PLINT exponent = 0;
PLFLT mant, tmp;
plplot-5.5.3-matwrap.patch:
--- NEW FILE plplot-5.5.3-matwrap.patch ---
--- plplot-5.5.3/bindings/octave/matwrap/matwrap.orig 2005-08-04 17:10:33.000000000 -0600
+++ plplot-5.5.3/bindings/octave/matwrap/matwrap 2005-08-04 17:11:02.000000000 -0600
@@ -216,7 +216,7 @@
my $incstr = $fname; # Assume we include the file as is.
if ($incstr =~ s@^/usr/include/@@ || # Is it a system include file?
$incstr =~ s@^/usr/local/include/@@ ||
- $incstr =~ s at .*/gcc-lib/.*/include/@@) { # Is it a system include
+ $incstr =~ s at .*/gcc/.*/include/@@) { # Is it a system include
# file that was fixed by gcc?
$include_str .= "#include <$incstr>\n"; # Use a different syntax.
} else {
@@ -228,7 +228,7 @@
grep(substr($fname, 0, length($_)) eq $_, @cpp_ignore_dirs) ||
# Or does it begin with the list of forbidden
# directories?
- $fname =~ m@/gcc-lib/@) { # Somewhere in gcc fixed includes?
+ $fname =~ m@/gcc/@) { # Somewhere in gcc fixed includes?
$remember_defs_in_file = 0; # We're not really interested in this file.
} else {
$remember_defs_in_file = 1; # This is a file we are actually
--- plplot-5.5.3/cf/octave.ac.orig 2005-08-09 09:34:00.000000000 -0600
+++ plplot-5.5.3/cf/octave.ac 2005-08-09 09:34:52.000000000 -0600
@@ -35,13 +35,7 @@
# check for matwrap
if test "$enable_octave" = "yes"; then
- AC_CHECK_PROG(has_matwrap, matwrap, yes, no)
- if test "$has_matwrap" = "yes"; then
- MATWRAP=`which matwrap`
- else
- MATWRAP=`pwd`"/bindings/octave/matwrap/matwrap"
- AC_MSG_WARN([Using builtin matwrap.]);
- fi
+ MATWRAP=`pwd`"/bindings/octave/matwrap/matwrap"
fi
# check for user supplied mkoctfile
plplot-5.5.3-tk.patch:
--- NEW FILE plplot-5.5.3-tk.patch ---
--- plplot-5.5.3/cf/tcl.ac.orig 2005-08-04 13:42:51.000000000 -0600
+++ plplot-5.5.3/cf/tcl.ac 2005-08-04 13:43:27.000000000 -0600
@@ -55,13 +55,10 @@
# "/usr" which would give bad result under Linux without this ordering.
incdirs_default="\
-/usr/include/tcl8.4/tcl-private/generic \
-/usr/include/tcl8.4/tk-private/generic \
-/usr/include/tcl8.4/itcl-private/generic \
+/usr/include/tcl-private/generic \
+/usr/include/tk-private/generic \
+/usr/include/itcl-private/generic \
/usr/include/tcl8.4 \
-/usr/include/tcl8.3/tcl-private/generic \
-/usr/include/tcl8.3/tk-private/generic \
-/usr/include/tcl8.3/itcl-private/generic \
/usr/include/tcl8.3 \
/usr/include/tcl8.2/generic \
$prefix/include/itcl \
--- NEW FILE plplot.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
Name: plplot
Version: 5.5.3
Release: 5%{?dist}
Summary: Library of functions for making scientific plots
Group: Applications/Engineering
License: LGPL
URL: http://plplot.sourceforge.net/
Source0: http://prdownloads.sf.net/plplot/%{name}-%{version}.tar.gz
Patch0: plplot-5.5.3-matwrap.patch
Patch1: plplot-5.5.3-tk.patch
Patch2: plplot-5.5.3-buffer.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: autoconf
BuildRequires: gcc-gfortran, freetype-devel, octave-devel, qhull-devel
BuildRequires: java-devel, libgcj-devel
BuildRequires: gd-devel, tcl-devel, tk-devel
BuildRequires: python-devel, pygtk2-devel, python-numeric
BuildRequires: libgnomeui-devel, libgnomeprintui22-devel, gnome-python2
BuildRequires: perl(XML::DOM)
#BuildRequires: libunicode-devel
%description
PLplot is a library of functions that are useful for making scientific
plots.
PLplot can be used from within compiled languages such as C, C++,
FORTRAN and Java, and interactively from interpreted languages such as
Octave, Python, Perl and Tcl.
The PLplot library can be used to create standard x-y plots, semilog
plots, log-log plots, contour plots, 3D surface plots, mesh plots, bar
charts and pie charts. Multiple graphs (of the same or different sizes)
may be placed on a single page with multiple lines in each graph.
A variety of output file devices such as Postscript, png, jpeg, LaTeX
and others, as well as interactive devices such as xwin, tk, xterm and
Tektronics devices are supported. New devices can be easily added by
writing a small number of device dependent routines.
There are almost 2000 characters in the extended character set. This
includes four different fonts, the Greek alphabet and a host of
mathematical, musical, and other symbols. Some devices supports its own
way of dealing with text, such as the Postscript and LaTeX drivers, or
the png and jpeg drivers that uses the Freetype library.
%package devel
Summary: Development headers and libraries for PLplot
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description devel
%{summary}
%package gnome
Summary: Functions for scientific plotting with GNOME
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description gnome
%{summary}
%package gnome-devel
Summary: Development files for using PLplot GNOME
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: %{name}-gnome = %{version}-%{release}
%description gnome-devel
%{summary}
%package octave
Summary: Functions for scientific plotting with Octave
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}, octave
%description octave
%{summary}
%package tk
Summary: Functions for scientific plotting with Tk
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description tk
%{summary}
%package tk-devel
Summary: Development files for using PLplot with Tk
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: %{name}-tk = %{version}-%{release}
%description tk-devel
%{summary}
%prep
%setup -q
%patch0 -p1 -b .orig
%patch1 -p1 -b .orig
%patch2 -p1 -b .orig
%build
autoconf
%configure --disable-static --without-rpath --with-pthreads \
--with-freetype-font-dir=/usr/share/fonts \
--with-libunicode=no --disable-cgm --disable-linuxvga \
--disable-wingcc --disable-aqt --disable-pdl
make
%check
make check
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
mv $RPM_BUILD_ROOT/%{_docdir}/plplot $RPM_BUILD_ROOT/%{_docdir}/plplot-%{version}
find $RPM_BUILD_ROOT -name \*.la | xargs rm
#Remove non-existant PDL dependency
rm -r $RPM_BUILD_ROOT%{_datadir}/plplot%{version}/examples/perl
#Permissions
find $RPM_BUILD_ROOT%{_docdir} -type f | xargs chmod -x
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%post gnome -p /sbin/ldconfig
%postun gnome -p /sbin/ldconfig
%post octave -p /sbin/ldconfig
%postun octave -p /sbin/ldconfig
%post tk -p /sbin/ldconfig
%postun tk -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%{_docdir}/plplot-%{version}/
%{_bindir}/plm2gif
%{_bindir}/plpr
%{_bindir}/plrender
%{_bindir}/pltek
%{_bindir}/pstex2eps
%{_libdir}/libcsirocsa.so.*
%{_libdir}/libcsironn.so.*
%{_libdir}/libplplotcxxd.so.*
%{_libdir}/libplplotd.so.*
%{_libdir}/libplplotf77cd.so.*
%{_libdir}/libplplotf77d.so.*
%dir %{_libdir}/plplot%{version}
%dir %{_libdir}/plplot%{version}/driversd
%{_libdir}/plplot%{version}/driversd/gd.rc
%{_libdir}/plplot%{version}/driversd/gd.so
%{_libdir}/plplot%{version}/driversd/hpgl.rc
%{_libdir}/plplot%{version}/driversd/hpgl.so
%{_libdir}/plplot%{version}/driversd/mem.rc
%{_libdir}/plplot%{version}/driversd/mem.so
%{_libdir}/plplot%{version}/driversd/null.rc
%{_libdir}/plplot%{version}/driversd/null.so
%{_libdir}/plplot%{version}/driversd/pbm.rc
%{_libdir}/plplot%{version}/driversd/pbm.so
%{_libdir}/plplot%{version}/driversd/plmeta.rc
%{_libdir}/plplot%{version}/driversd/plmeta.so
%{_libdir}/plplot%{version}/driversd/ps.rc
%{_libdir}/plplot%{version}/driversd/ps.so
%{_libdir}/plplot%{version}/driversd/pstex.rc
%{_libdir}/plplot%{version}/driversd/pstex.so
%{_libdir}/plplot%{version}/driversd/xfig.rc
%{_libdir}/plplot%{version}/driversd/xfig.so
%{_libdir}/plplot%{version}/driversd/xwin.rc
%{_libdir}/plplot%{version}/driversd/xwin.so
%{_libdir}/jni/plplotjavac_wrap.so
%{python_sitelib}/_plplotcmodule.so
%{python_sitelib}/plplot.py
%{python_sitelib}/plplot_widgetmodule.so
%{python_sitelib}/plplotc.py
%{python_sitelib}/plplotcanvas.py
%{_mandir}/man1/plm2gif.1.gz
%{_mandir}/man1/plpr.1.gz
%{_mandir}/man1/plrender.1.gz
%{_mandir}/man1/pltek.1.gz
%{_mandir}/man1/pstex2eps.1.gz
%{_datadir}/java/plplot.jar
%dir %{_datadir}/plplot%{version}
%{_datadir}/plplot%{version}/*.map
%{_datadir}/plplot%{version}/*.fnt
%{_datadir}/plplot%{version}/pkgIndex.tcl
%{_datadir}/plplot%{version}/tcl/
%dir %{_datadir}/plplot%{version}/examples
%{_datadir}/plplot%{version}/examples/python/
%{_datadir}/plplot%{version}/examples/test_python.sh
%{_datadir}/plplot%{version}/examples/test_tcl.sh
%{_datadir}/plplot%{version}/examples/plplot-test.sh
%files devel
%defattr(-,root,root,-)
%{_bindir}/plplot-config
%{_bindir}/plplot_libtool
%{_mandir}/man1/plplot_libtool.1.gz
%{_includedir}/plplot/
%{_libdir}/libcsirocsa.so
%{_libdir}/libcsironn.so
%{_libdir}/libplplotcxxd.so
%{_libdir}/libplplotd.so
%{_libdir}/libplplotf77cd.so
%{_libdir}/libplplotf77d.so
%{_datadir}/plplot%{version}/examples/c/
%{_datadir}/plplot%{version}/examples/c++/
%{_datadir}/plplot%{version}/examples/f77/
%{_datadir}/plplot%{version}/examples/java/
%{_datadir}/plplot%{version}/examples/Makefile
%{_datadir}/plplot%{version}/examples/test_c.sh
%{_datadir}/plplot%{version}/examples/test_cxx.sh
%{_datadir}/plplot%{version}/examples/test_f77.sh
%{_datadir}/plplot%{version}/examples/test_java.sh
%files gnome
%defattr(-,root,root,-)
%{_libdir}/libplplotgnome2d.so.*
%{_libdir}/plplot%{version}/driversd/gcw.rc
%{_libdir}/plplot%{version}/driversd/gcw.so
%{python_sitelib}/gcwmodule.so
%{python_sitelib}/cplplotcanvasmodule.so
%files gnome-devel
%defattr(-,root,root,-)
%{_libdir}/libplplotgnome2d.so
%files octave
%defattr(-,root,root,-)
%{_datadir}/plplot_octave/
%{_datadir}/octave/site/m/PLplot/
%{_libexecdir}/octave/site/oct/*/plplot_octave.oct
%{_datadir}/plplot%{version}/examples/octave/
%{_datadir}/plplot%{version}/examples/test_octave.sh
%files tk
%defattr(-,root,root,-)
%{_bindir}/plserver
%{_bindir}/pltcl
%{_libdir}/libplplottcltkd.so.*
%{_libdir}/libtclmatrixd.so.*
%{_libdir}/plplot%{version}/driversd/tk.rc
%{_libdir}/plplot%{version}/driversd/tk.so
%{_libdir}/plplot%{version}/driversd/tkwin.rc
%{_libdir}/plplot%{version}/driversd/tkwin.so
%{_mandir}/man1/plserver.1.gz
%{_mandir}/man1/pltcl.1.gz
%files tk-devel
%defattr(-,root,root,-)
%{_libdir}/libplplottcltkd.so
%{_libdir}/libtclmatrixd.so
%{_datadir}/plplot%{version}/examples/tcl/
%{_datadir}/plplot%{version}/examples/tk/
%changelog
* Tue Aug 09 2005 - Orion Poplawski <orion at cora.nwra.com> - 5.5.3-5
- Explicitly turn off unused features in configure
- rpmlint cleanup
- add make check
* Mon Aug 08 2005 - Orion Poplawski <orion at cora.nwra.com> - 5.5.3-4
- Remove smp build due to problems
- Add gnome-python2 BuildRequires
* Mon Aug 08 2005 - Orion Poplawski <orion at cora.nwra.com> - 5.5.3-3
- Split into multipe packages
* Mon Aug 08 2005 - Orion Poplawski <orion at cora.nwra.com> - 5.5.3-2
- Shorten summary
- Fix Source URL
* Thu Aug 04 2005 - Orion Poplawski <orion at cora.nwra.com> - 5.5.3-1
- Initial Fedora Extras release
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plplot/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 10 Aug 2005 17:14:07 -0000 1.1
+++ .cvsignore 10 Aug 2005 17:15:10 -0000 1.2
@@ -0,0 +1 @@
+plplot-5.5.3.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plplot/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 10 Aug 2005 17:14:07 -0000 1.1
+++ sources 10 Aug 2005 17:15:10 -0000 1.2
@@ -0,0 +1 @@
+6df3d63cffac28337ff7fa56712da5c7 plplot-5.5.3.tar.gz
More information about the fedora-extras-commits
mailing list