rpms/plplot/devel plplot-5.7.2-nopgcpp.patch, NONE, 1.1 plplot-5.6.1-octave.patch, 1.3, 1.4 plplot.spec, 1.25, 1.26 plplot-5.5.3-matwrap.patch, 1.2, NONE plplot-5.6.0-x.patch, 1.1, NONE plplot-5.6.1-font.patch, 1.1, NONE

Orion Poplawski (orion) fedora-extras-commits at redhat.com
Tue Jan 23 21:00:39 UTC 2007 

Author: orion

Update of /cvs/extras/rpms/plplot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12193

Modified Files:
	plplot-5.6.1-octave.patch plplot.spec 
Added Files:
	plplot-5.7.2-nopgcpp.patch 
Removed Files:
	plplot-5.5.3-matwrap.patch plplot-5.6.0-x.patch 
	plplot-5.6.1-font.patch 
Log Message:
- Update to 5.7.2 which uses cmake
- Add patch to use -nopgcpp with swig java generation
- Enable more drivers


plplot-5.7.2-nopgcpp.patch:

--- NEW FILE plplot-5.7.2-nopgcpp.patch ---
--- plplot-5.7.2/bindings/java/CMakeLists.txt.nopgcpp	2007-01-21 17:46:00.000000000 -0700
+++ plplot-5.7.2/bindings/java/CMakeLists.txt	2007-01-23 11:21:34.000000000 -0700
@@ -82,7 +82,7 @@
 
 # Can't use source file properties as we have to quote the flags in that 
 # case and it breaks swig. Doh! I would call this a cmake bug.
-set(CMAKE_SWIG_FLAGS -DPL_DOUBLE -DSWIG_JAVA -package plplot.core)
+set(CMAKE_SWIG_FLAGS -nopgcpp -DPL_DOUBLE -DSWIG_JAVA -package plplot.core)
 
 set( CMAKE_SWIG_OUTDIR ${CMAKE_CURRENT_BINARY_DIR} )
 

plplot-5.6.1-octave.patch:

Index: plplot-5.6.1-octave.patch
===================================================================
RCS file: /cvs/extras/rpms/plplot/devel/plplot-5.6.1-octave.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plplot-5.6.1-octave.patch	2 Nov 2006 16:56:33 -0000	1.3
+++ plplot-5.6.1-octave.patch	23 Jan 2007 21:00:08 -0000	1.4
@@ -67,39 +67,6 @@
  
  printf ("Use PLplot: %s\n", use_plplot_state);
  
-Index: plplot/test/plplot-test.sh.in
-===================================================================
-RCS file: /cvsroot/plplot/plplot/test/plplot-test.sh.in,v
-retrieving revision 1.37
-diff -u -r1.37 plplot-test.sh.in
---- plplot/test/plplot-test.sh.in	27 Jul 2006 21:55:35 -0000	1.37
-+++ plplot/test/plplot-test.sh.in	7 Aug 2006 17:45:44 -0000
-@@ -146,7 +146,7 @@
- perldir=$SRC_EXAMPLES_DIR/perl
- javadir=$EXAMPLES_DIR/java
- octave=@OCTAVE@
--octavedir=$SRC_EXAMPLES_DIR/../bindings/octave//:$SRC_EXAMPLES_DIR/octave//:@PLPLOT_OCTAVE_DIR@//:@OCTAVE_M_DIR@//:@OCTAVE_OCT_DIR@//:
-+octavedir=$SRC_EXAMPLES_DIR/../bindings/octave
- PATH=$EXAMPLES_DIR/../utils:@exec_prefix@/bin:$PATH
- export cdir cxxdir f77dir f95dir pythondir javadir octave octavedir tcldir perldir PATH
- 
-Index: plplot/test/test_octave.sh.in
-===================================================================
-RCS file: /cvsroot/plplot/plplot/test/test_octave.sh.in,v
-retrieving revision 1.4
-diff -u -r1.4 test_octave.sh.in
---- plplot/test/test_octave.sh.in	26 Apr 2006 14:36:02 -0000	1.4
-+++ plplot/test/test_octave.sh.in	7 Aug 2006 17:45:44 -0000
-@@ -30,7 +30,8 @@
- export LD_LIBRARY_PATH=$TOPDIR/src/.libs:$TOPDIR/lib/csa/.libs:$TOPDIR/lib/nn/.libs
- 
- # Launch an Octave script that exercises all the demos
--$octave -f -q -p $octavedir <<EOF
-+$octave -f -q <<EOF
-+addpath(genpath("$octavedir"));
- plplot_stub;
- t = split("$options", "-"); t(1,:)="";
- for i=1:rows(t)
 --- plplot-5.6.1/bindings/octave/PLplot/shade.m.octave	2004-06-14 15:51:51.000000000 -0600
 +++ plplot-5.6.1/bindings/octave/PLplot/shade.m	2006-08-07 14:03:03.000000000 -0600
 @@ -26,11 +26,11 @@
@@ -191,23 +158,3 @@
  
    end_unwind_protect  
  
---- plplot-5.6.1/configure.octave	2006-08-07 14:07:47.000000000 -0600
-+++ plplot-5.6.1/configure	2006-08-07 14:08:33.000000000 -0600
-@@ -22006,7 +22006,7 @@
- 
-         echo "$as_me:$LINENO: checking Octave m dir" >&5
- echo $ECHO_N "checking Octave m dir... $ECHO_C" >&6
--	if test -n "`echo $OCTAVE_VERSION | sed 's/^2.1//p;d;q'`" ; then
-+	if test -n "`echo $OCTAVE_VERSION | sed 's/^2.[19]//p;d;q'`" ; then
-             # Octave version 2.1
- 
- OCTAVE_M_DIR=`$OCTAVE -q -f <<EOF
-@@ -22033,7 +22033,7 @@
- 
-         echo "$as_me:$LINENO: checking Octave oct dir" >&5
- echo $ECHO_N "checking Octave oct dir... $ECHO_C" >&6
--	if test -n "`echo $OCTAVE_VERSION | sed 's/^2.1//p;d;q'`" ; then
-+	if test -n "`echo $OCTAVE_VERSION | sed 's/^2.[19]//p;d;q'`" ; then
-             # Octave version 2.1
- 
- OCTAVE_OCT_DIR=`$OCTAVE -q -f <<EOF


Index: plplot.spec
===================================================================
RCS file: /cvs/extras/rpms/plplot/devel/plplot.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- plplot.spec	15 Dec 2006 08:15:58 -0000	1.25
+++ plplot.spec	23 Jan 2007 21:00:08 -0000	1.26
@@ -1,29 +1,28 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?octave_api: %define octave_api %(octave-config -p API_VERSION || echo 0)}
 
 Name:           plplot
-Version:        5.6.1
-Release:        9%{?dist}
+Version:        5.7.2
+Release:        1%{?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.6.1-octave.patch
 Patch2:         plplot-5.6.1-info.patch
-Patch3:         plplot-5.6.1-font.patch
-Patch6:         plplot-5.6.0-x.patch
+Patch3:         plplot-5.7.2-nopgcpp.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  cmake, libtool-ltdl-devel, swig
 BuildRequires:  gcc-gfortran, freetype-devel, octave-devel, qhull-devel
 BuildRequires:  java-devel, libgcj-devel, ncurses-devel
 BuildRequires:  gd-devel, tcl-devel, tk-devel
 BuildRequires:  python-devel, pygtk2-devel, python-numeric
 BuildRequires:  libgnomeui-devel, libgnomeprintui22-devel, gnome-python2-devel
-BuildRequires:  perl(XML::DOM)
-BuildRequires:  lasi-devel
-BuildRequires:  wxGTK-devel
+BuildRequires:  perl(XML::DOM), lasi-devel, wxGTK-devel, agg-devel
+BuildRequires:  svgalib-devel, freefont
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 Requires:       freefont
@@ -116,6 +115,7 @@
 Summary:        Functions for scientific plotting with Octave
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}, octave
+#Requires:       octave(api) = %{octave_api}
 
 %description    octave
 %{summary}.
@@ -152,33 +152,56 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .orig
 %patch1 -p1 -b .octave
 %patch2 -p1 -b .orig
-%patch3 -p1 -b .font
-%patch6 -p1 -b .orig
+%patch3 -p1 -b .nopgcpp
 
 
 %build
-%configure --enable-f95 --disable-static --without-rpath --with-pthreads \
-           --with-freetype-font-dir=/usr/share/fonts/freefont \
-           --with-libunicode=no --disable-cgm --disable-linuxvga \
-           --disable-wingcc --disable-aqt --disable-pdl --enable-psttf \
-           --with-prebuiltdoc
-make
+mkdir fedora
+cd fedora
+export CFLAGS="$RPM_OPT_FLAGS"
+export CXXFLAGS="$RPM_OPT_FLAGS"
+export FFLAGS="$RPM_OPT_FLAGS"
+cmake .. \
+        -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
+        -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \
+        -DBUILD_SHARED_LIBS:BOOL=ON \
+	-DPL_FREETYPE_FONT_PATH:PATH="/usr/share/fonts/freefont" \
+	-DPLD_aqt:BOOL=ON \
+	-DPLD_conex:BOOL=ON \
+	-DPLD_dg300:BOOL=ON \
+	-DPLD_imp:BOOL=ON \
+	-DPLD_linuxvga:BOOL=ON \
+	-DPLD_ljii:BOOL=ON \
+	-DPLD_ljiip:BOOL=ON \
+	-DPLD_mskermit:BOOL=ON \
+	-DPLD_ntk:BOOL=ON \
+	-DPLD_svg:BOOL=ON \
+	-DPLD_tek4010:BOOL=ON \
+	-DPLD_tek4010f:BOOL=ON \
+	-DPLD_tek4107:BOOL=ON \
+	-DPLD_tek4107f:BOOL=ON \
+	-DPLD_versaterm:BOOL=ON \
+	-DPLD_vlt:BOOL=ON \
+	-DPLD_xterm:BOOL=ON \
+	-DBUILD_TEST=ON
+make VERBOSE=1
 
 
 %check
-make check
+cd fedora
+ctest
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
+cd fedora
 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
-#Permissions
-find $RPM_BUILD_ROOT%{_docdir} -type f | xargs chmod -x
+
+# 'cmake' does not set +x permissions for libraries; hence they won't be stripped
+find $RPM_BUILD_ROOT%_libdir -name \*.so | xargs chmod +x
 
 
 %clean
@@ -219,12 +242,24 @@
 %{_bindir}/pstex2eps
 %dir %{_libdir}/plplot%{version}
 %dir %{_libdir}/plplot%{version}/driversd
+%{_libdir}/plplot%{version}/driversd/dg300.rc
+%{_libdir}/plplot%{version}/driversd/dg300.so
 %{_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/impress.rc
+%{_libdir}/plplot%{version}/driversd/impress.so
+%{_libdir}/plplot%{version}/driversd/linuxvga.rc
+%{_libdir}/plplot%{version}/driversd/linuxvga.so
+%{_libdir}/plplot%{version}/driversd/ljii.rc
+%{_libdir}/plplot%{version}/driversd/ljii.so
+%{_libdir}/plplot%{version}/driversd/ljiip.rc
+%{_libdir}/plplot%{version}/driversd/ljiip.so
 %{_libdir}/plplot%{version}/driversd/mem.rc
 %{_libdir}/plplot%{version}/driversd/mem.so
+%{_libdir}/plplot%{version}/driversd/ntk.rc
+%{_libdir}/plplot%{version}/driversd/ntk.so
 %{_libdir}/plplot%{version}/driversd/null.rc
 %{_libdir}/plplot%{version}/driversd/null.so
 %{_libdir}/plplot%{version}/driversd/pbm.rc
@@ -235,6 +270,10 @@
 %{_libdir}/plplot%{version}/driversd/ps.so
 %{_libdir}/plplot%{version}/driversd/psttf.rc
 %{_libdir}/plplot%{version}/driversd/psttf.so
+%{_libdir}/plplot%{version}/driversd/svg.rc
+%{_libdir}/plplot%{version}/driversd/svg.so
+%{_libdir}/plplot%{version}/driversd/tek.rc
+%{_libdir}/plplot%{version}/driversd/tek.so
 %{_libdir}/plplot%{version}/driversd/xfig.rc
 %{_libdir}/plplot%{version}/driversd/xfig.so
 %{_libdir}/plplot%{version}/driversd/xwin.rc
@@ -244,7 +283,7 @@
 %{python_sitelib}/plplot_widgetmodule.so
 %{python_sitelib}/plplotc.py*
 %{python_sitelib}/plplotcanvas.py*
-%{_infodir}/plplotdoc.info*
+#%{_infodir}/plplotdoc.info*
 %{_mandir}/man1/plm2gif.1.gz
 %{_mandir}/man1/plpr.1.gz
 %{_mandir}/man1/plrender.1.gz
@@ -274,9 +313,7 @@
 
 %files devel
 %defattr(-,root,root,-)
-%{_bindir}/plplot-config
-%{_bindir}/plplot_libtool
-%{_mandir}/man1/plplot_libtool.1.gz
+#%{_bindir}/plplot-config
 %{_includedir}/plplot/
 %{_libdir}/libcsirocsa.so
 %{_libdir}/libcsironn.so
@@ -291,6 +328,7 @@
 %{_libdir}/pkgconfig/plplotd-c++.pc
 %{_libdir}/pkgconfig/plplotd-f77.pc
 %{_libdir}/pkgconfig/plplotd-f95.pc
+%{_datadir}/plplot%{version}/examples/lena.pgm
 %{_datadir}/plplot%{version}/examples/c/
 %{_datadir}/plplot%{version}/examples/c++/
 %{_datadir}/plplot%{version}/examples/f77/
@@ -300,7 +338,7 @@
 %{_datadir}/plplot%{version}/examples/test_cxx.sh
 %{_datadir}/plplot%{version}/examples/test_f77.sh
 %{_datadir}/plplot%{version}/examples/test_f95.sh
-%{_mandir}/man3/pl*.3*
+#%{_mandir}/man3/pl*.3*
 
 %files gnome
 %defattr(-,root,root,-)
@@ -330,6 +368,7 @@
 %{_datadir}/plplot_octave/
 %{_datadir}/octave/site/m/PLplot/
 %{_libexecdir}/octave/site/oct/*/plplot_octave.oct
+%{_datadir}/plplot%{version}/examples/lena.img
 %{_datadir}/plplot%{version}/examples/octave/
 %{_datadir}/plplot%{version}/examples/test_octave.sh
 
@@ -361,6 +400,11 @@
 
 
 %changelog
+* Tue Jan 23 2007 - Orion Poplawski <orion at cora.nwra.com> - 5.7.2-1
+- Update to 5.7.2 which uses cmake
+- Add patch to use -nopgcpp with swig java generation
+- Enable more drivers
+
 * Thu Dec 14 2006 - Jef Spaleta <jspaleta at gmail.com> - 5.6.1-9
 - Bump and build for python 2.5
 


--- plplot-5.5.3-matwrap.patch DELETED ---


--- plplot-5.6.0-x.patch DELETED ---


--- plplot-5.6.1-font.patch DELETED ---

More information about the fedora-extras-commits mailing list