rpms/plplot/F-11 plplot-5.9.4-octave32.patch, NONE, 1.1 plplot-5.9.4-transform_version.patch, NONE, 1.1 plplot-5.9.5-test.patch, NONE, 1.1 .cvsignore, 1.17, 1.18 plplot.spec, 1.75, 1.76 sources, 1.17, 1.18
alexlan
alexlan at fedoraproject.org
Mon Oct 19 20:53:30 UTC 2009
- Previous message (by thread): rpms/gucharmap/F-12 .cvsignore, 1.24, 1.25 gucharmap.spec, 1.44, 1.45 sources, 1.24, 1.25
- Next message (by thread): rpms/gnome-terminal/F-12 .cvsignore, 1.64, 1.65 gnome-terminal.spec, 1.130, 1.131 sources, 1.65, 1.66
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: alexlan
Update of /cvs/pkgs/rpms/plplot/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12343
Modified Files:
.cvsignore plplot.spec sources
Added Files:
plplot-5.9.4-octave32.patch
plplot-5.9.4-transform_version.patch plplot-5.9.5-test.patch
Log Message:
Updates for octave 3.2.x (#525423)
plplot-5.9.4-octave32.patch:
PLplot/closefig.m | 2 +-
demos/p4.m | 2 +-
demos/p5.m | 2 +-
demos/x03c.m | 6 +++---
4 files changed, 6 insertions(+), 6 deletions(-)
--- NEW FILE plplot-5.9.4-octave32.patch ---
--- plplot-5.9.4/bindings/octave/PLplot/closefig.m.octave32 2009-08-13 21:30:05.511036727 -0600
+++ plplot-5.9.4/bindings/octave/PLplot/closefig.m 2009-08-13 21:30:52.206974684 -0600
@@ -21,7 +21,7 @@
global __pl
- if ( !(exist "__pl") || !struct_contains (__pl,"inited"))
+ if ( !(exist ("__pl")) || !struct_contains (__pl,"inited"))
return;
endif
--- plplot-5.9.4/bindings/octave/demos/p4.m.octave32 2009-05-10 13:37:17.000000000 -0600
+++ plplot-5.9.4/bindings/octave/demos/p4.m 2009-08-13 22:50:58.068005128 -0600
@@ -21,7 +21,7 @@
x=0.01:0.1:10;
y=exp(x);
- og = grid "minor";
+ og = grid ("minor");
title("Log-log example");
loglog(x,y,'y')
grid (og);
--- plplot-5.9.4/bindings/octave/demos/p5.m.octave32 2009-05-10 13:37:17.000000000 -0600
+++ plplot-5.9.4/bindings/octave/demos/p5.m 2009-08-13 22:51:21.277975680 -0600
@@ -21,7 +21,7 @@
x=-pi:0.01:pi;
y=sin(x).+cos(3*x);
- og = grid "on";
+ og = grid ("on");
title("Polar example");
polar(x,y,'y')
grid (og);
--- plplot-5.9.4/bindings/octave/demos/x03c.m.octave32 2009-05-10 13:37:17.000000000 -0600
+++ plplot-5.9.4/bindings/octave/demos/x03c.m 2009-08-26 11:50:28.362630969 -0600
@@ -47,11 +47,11 @@
plenv(-1.3, 1.3, -1.3, 1.3, 1, -2);
for i=1:10
- x(:) = 0.1 * i * x0(:);
- y(:) = 0.1 * i * y0(:);
+ x = 0.1 * i * x0(:);
+ y = 0.1 * i * y0(:);
## Draw circles for polar grid */
- plline(x', y');
+ plline(x, y);
endfor
plcol0(2);
plplot-5.9.4-transform_version.patch:
plplot.cmake | 50 +++++++++++++++++++++++++++++++++++---------------
1 file changed, 35 insertions(+), 15 deletions(-)
--- NEW FILE plplot-5.9.4-transform_version.patch ---
--- plplot-5.9.4/cmake/modules/plplot.cmake.transform_version 2009-05-10 13:37:17.000000000 -0600
+++ plplot-5.9.4/cmake/modules/plplot.cmake 2009-08-26 10:33:56.174638294 -0600
@@ -30,21 +30,41 @@
# Useful macros....
-macro(TRANSFORM_VERSION _numerical_result _version)
-# _version must be a period-delimited triplet string of the form
-# "major.minor.patch".
-# This macro transforms that into a numerical result that can be compared.
-if(${_version} MATCHES "^[0-9]*\\.[0-9]*\\.[0-9]*$")
- string(REGEX REPLACE "^([0-9]*)\\.[0-9]*\\.[0-9]*$" "\\1" _major ${_version})
- string(REGEX REPLACE "^[0-9]*\\.([0-9]*)\\.[0-9]*$" "\\1" _minor ${_version})
- string(REGEX REPLACE "^[0-9]*\\.[0-9]*\\.([0-9]*)$" "\\1" _patch ${_version})
- math(EXPR ${_numerical_result}
- "${_major}*1000000 + ${_minor}*1000 + ${_patch}
- ")
-else(${_version} MATCHES "^[0-9]*\\.[0-9]*\\.[0-9]*$")
- set(${_numerical_result} 0)
-endif(${_version} MATCHES "^[0-9]*\\.[0-9]*\\.[0-9]*$")
-endmacro(TRANSFORM_VERSION)
+function(TRANSFORM_VERSION numerical_result version)
+ # internal_version ignores everything in version after any character that
+ # is not 0-9 or ".". This should take care of the case when there is
+ # some non-numerical data in the patch version.
+ #message(STATUS "DEBUG: version = ${version}")
+ string(REGEX REPLACE "^([0-9.]+).*$" "\\1" internal_version ${version})
+
+ # internal_version is normally a period-delimited triplet string of the form
+ # "major.minor.patch", but patch and/or minor could be missing.
+ # Transform internal_version into a numerical result that can be compared.
+ string(REGEX REPLACE "^([0-9]*).+$" "\\1" major ${internal_version})
+ string(REGEX REPLACE "^[0-9]*\\.([0-9]*).*$" "\\1" minor ${internal_version})
+ string(REGEX REPLACE "^[0-9]*\\.[0-9]*\\.([0-9]*)$" "\\1" patch ${internal_version})
+
+ if(NOT patch MATCHES "[0-9]+")
+ set(patch 0)
+ endif(NOT patch MATCHES "[0-9]+")
+
+ if(NOT minor MATCHES "[0-9]+")
+ set(minor 0)
+ endif(NOT minor MATCHES "[0-9]+")
+
+ if(NOT major MATCHES "[0-9]+")
+ set(major 0)
+ endif(NOT major MATCHES "[0-9]+")
+ #message(STATUS "DEBUG: internal_version = ${internal_version}")
+ #message(STATUS "DEBUG: major = ${major}")
+ #message(STATUS "DEBUG: minor= ${minor}")
+ #message(STATUS "DEBUG: patch = ${patch}")
+ math(EXPR internal_numerical_result
+ "${major}*1000000 + ${minor}*1000 + ${patch}"
+ )
+ #message(STATUS "DEBUG: ${numerical_result} = ${internal_numerical_result}")
+ set(${numerical_result} ${internal_numerical_result} PARENT_SCOPE)
+endfunction(TRANSFORM_VERSION)
macro(split_libraries_list _list _list_general _list_debug _list_optimized)
# Macro for splitting a libraries list into its keyword denoted general,
plplot-5.9.5-test.patch:
plplot-test.sh.cmake | 45 ++++++++++++++-------------------------------
1 file changed, 14 insertions(+), 31 deletions(-)
--- NEW FILE plplot-5.9.5-test.patch ---
--- plplot-5.9.4/plplot_test/plplot-test.sh.cmake.test 2009-08-26 13:43:29.454693200 -0600
+++ plplot-5.9.4/plplot_test/plplot-test.sh.cmake 2009-08-26 13:46:14.464631523 -0600
@@ -35,8 +35,9 @@
version=@VERSION@
-EXAMPLES_DIR=${EXAMPLES_DIR:-.}
-SRC_EXAMPLES_DIR=${SRC_EXAMPLES_DIR:-.}
+EXE_DIR=`dirname $0`
+EXAMPLES_DIR=${EXAMPLES_DIR:=$EXE_DIR}
+SRC_EXAMPLES_DIR=${SRC_EXAMPLES_DIR:=$EXE_DIR}
OUTPUT_DIR=${OUTPUT_DIR:-.}
device=${DEVICE:-psc}
export EXAMPLES_DIR SRC_EXAMPLES_DIR OUTPUT_DIR device DEBUG_CMD
@@ -148,18 +149,6 @@
shift
done
-# This script is only designed to work when EXAMPLES_DIR is a directory
-# with a subdirectory called "c". Check whether this conditions is true.
-
-if [ ! -d $EXAMPLES_DIR/c ] ; then
-echo '
-This script is only designed to work when the EXAMPLES_DIR environment
-variable (overridden by option --examples-dir) is a directory with a
-subdirectory called "c". This condition has been violated.
-'
-exit 1
-fi
-
# These variables set by default assuming you are going to run this
# script from the installed demos directory $prefix/lib/plplot$version/examples.
cdir=$EXAMPLES_DIR/c
@@ -295,21 +284,18 @@
dsuffix=$device
export dsuffix options
-# Find out what front-ends have been configured
+# Find out what front-ends have been configured and installed
if [ -z "$FRONT_END" ] ; then
- FRONT_END=c
- test "@ENABLE_cxx@" = "ON" && FRONT_END="$FRONT_END cxx"
- test "@ENABLE_f77@" = "ON" && FRONT_END="$FRONT_END f77"
- test "@ENABLE_f95@" = "ON" && FRONT_END="$FRONT_END f95"
- test "@ENABLE_java@" = "ON" && FRONT_END="$FRONT_END java"
- test "@ENABLE_octave@" = "ON" && FRONT_END="$FRONT_END octave"
- test "@ENABLE_python@" = "ON" && FRONT_END="$FRONT_END python"
- test "@ENABLE_tcl@" = "ON" && FRONT_END="$FRONT_END tcl"
- test "@ENABLE_pdl@" = "ON" && FRONT_END="$FRONT_END pdl"
- test "@ENABLE_ada@" = "ON" && FRONT_END="$FRONT_END ada"
- test "@ENABLE_ocaml@" = "ON" && FRONT_END="$FRONT_END ocaml"
- test "@ENABLE_lua@" = "ON" && FRONT_END="$FRONT_END lua"
- test "@ENABLE_d@" = "ON" && FRONT_END="$FRONT_END d"
+ for front_end_status in c:@ENABLE_c@ cxx:@ENABLE_cxx@ f77:@ENABLE_f77@ \
+ f95:@ENABLE_f95@ java:@ENABLE_java@ \
+ octave:@ENABLE_octave@ python:@ENABLE_python@ \
+ tcl:@ENABLE_tcl@ perl:@ENABLE_pdl@ \
+ ada:@ENABLE_ada@ ocaml:@ENABLE_ocaml@ \
+ lua:@ENABLE_lua@ d:@ENABLE_d@
+ do
+ front_end=${front_end_status/:ON/}
+ [ $front_end != $front_end_status ] && [ -d $EXAMPLES_DIR/$front_end ] && FRONT_END="$FRONT_END $front_end"
+ done
fi
# Find where the front-end scripts are by looking at the directory name of the
@@ -335,9 +321,6 @@
for i in $FRONT_END ; do
echo "Testing front-end $i"
script=$scripts_dir/test_$i.sh
- if [ "@WIN32@" != "1" ] ; then
- chmod +x $script
- fi
@SH_EXECUTABLE@ $script || status=1
done
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/F-11/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore 26 May 2009 15:07:45 -0000 1.17
+++ .cvsignore 19 Oct 2009 20:53:29 -0000 1.18
@@ -1 +1 @@
-plplot-5.9.4.tar.gz
+plplot-5.9.5.tar.gz
Index: plplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/F-11/plplot.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- plplot.spec 26 May 2009 15:07:45 -0000 1.75
+++ plplot.spec 19 Oct 2009 20:53:30 -0000 1.76
@@ -9,7 +9,7 @@
%bcond_without pdl
Name: plplot
-Version: 5.9.4
+Version: 5.9.5
Release: 1%{?dist}
Summary: Library of functions for making scientific plots
@@ -19,7 +19,9 @@ URL: http://plplot.sourceforg
Source0: http://downloads.sourceforge.net/plplot/%{name}-%{version}.tar.gz
Patch1: plplot-5.9.3-multiarch.patch
Patch2: plplot-5.9.2-info.patch
-Patch5: plplot-5.9.3-test.patch
+Patch3: plplot-5.9.4-octave32.patch
+Patch4: plplot-5.9.4-transform_version.patch
+Patch5: plplot-5.9.5-test.patch
Patch6: plplot-5.7.3-jni.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -57,6 +59,11 @@ BuildRequires: texlive, texinfo, openja
BuildRequires: ocaml, ocaml-findlib, ocaml-camlidl-devel
%endif
BuildRequires: lua-devel
+BuildRequires: qt-devel
+#For pyqt4
+BuildRequires: PyQt4-devel
+#For Qt tests
+BuildRequires: xorg-x11-xauth, xorg-x11-server-Xvfb
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info
Requires: gnu-free-mono-fonts
@@ -170,9 +177,6 @@ Summary: Functions for scientific
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Provides: ocaml-plplot = %{version}-%{release}
-%define _use_internal_dependency_generator 0
-%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh
-%define __find_provides /usr/lib/rpm/ocaml-find-provides.sh
%description ocaml
%{summary}.
@@ -212,6 +216,35 @@ Requires: %{name} = %{version}-%{r
%endif
+%package pyqt
+Summary: Functions for scientific plotting with PyQt
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description pyqt
+%{summary}.
+
+
+%package qt
+Summary: Functions for scientific plotting with Qt
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description qt
+%{summary}.
+
+%package qt-devel
+Summary: Development files for using PLplot with Qt
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-devel = %{version}-%{release}
+Requires: %{name}-qt = %{version}-%{release}
+Requires: pkgconfig
+
+%description qt-devel
+%{summary}.
+
+
%package tk
Summary: Functions for scientific plotting with Tk
Group: Development/Libraries
@@ -256,6 +289,8 @@ Requires: pkgconfig
%setup -q
%patch1 -p1 -b .multiarch
%patch2 -p1 -b .info
+#%patch3 -p1 -b .octave32
+#patch4 -p1 -b .transform_version
%patch5 -p1 -b .test
%patch6 -p1 -b .jni
# Convert to UTF-8
@@ -275,49 +310,49 @@ export CXXFLAGS="$RPM_OPT_FLAGS"
export FFLAGS="$RPM_OPT_FLAGS"
#Needed for octave output to not have control characters
unset TERM
+printenv
%cmake .. \
- -DCMAKE_SKIP_RPATH:BOOL=OFF \
- -DUSE_RPATH:BOOL=OFF \
+ -DCMAKE_SKIP_RPATH:BOOL=OFF \
+ -DCMAKE_Fortran_COMPILER:FILEPATH=%{_bindir}/gfortran \
+ -DUSE_RPATH:BOOL=OFF \
-DENABLE_ada:BOOL=ON \
-DHAVE_ADA_2007:BOOL=ON \
- -DENABLE_d:BOOL=ON \
- -DENABLE_itcl:BOOL=ON \
- -DENABLE_itk:BOOL=ON \
- -DENABLE_lua:BOOL=ON \
- -DHAVE_lua51:BOOL=ON \
- -DENABLE_ocaml:BOOL=ON \
- -DOCAML_INSTALL_DIR:PATH=`ocamlc -where` \
- %{build_octave} \
- -DENABLE_pdl:BOOL=ON \
- -DENABLE_tk:BOOL=ON \
- -DHAVE_PTHREAD:BOOL=ON \
- -DPL_FREETYPE_FONT_PATH:PATH="/usr/share/fonts/gnu-free" \
- -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_pstex: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 \
- -DPLD_wxwidgets:BOOL=ON \
+ -DENABLE_d:BOOL=ON \
+ -DENABLE_itcl:BOOL=ON \
+ -DENABLE_itk:BOOL=ON \
+ -DENABLE_lua:BOOL=ON \
+ -DHAVE_lua51:BOOL=ON \
+ -DENABLE_ocaml:BOOL=ON \
+ -DOCAML_INSTALL_DIR:PATH=`ocamlc -where` \
+ %{build_octave} \
+ -DENABLE_pdl:BOOL=ON \
+ -DENABLE_tk:BOOL=ON \
+ -DHAVE_PDL_GRAPHICS_PLPLOT_40:BOOL=ON \
+ -DHAVE_PTHREAD:BOOL=ON \
+ -DPL_FREETYPE_FONT_PATH:PATH="/usr/share/fonts/gnu-free" \
+ -DPLD_aqt:BOOL=ON \
+ -DPLD_conex:BOOL=ON \
+ -DPLD_imp:BOOL=ON \
+ -DPLD_linuxvga:BOOL=ON \
+ -DPLD_mskermit:BOOL=ON \
+ -DPLD_ntk:BOOL=ON \
+ -DPLD_pstex: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 \
+ -DPLD_wxwidgets:BOOL=ON \
%if %{with doc}
- -DXML_DECL:FILEPATH=/usr/share/sgml/xml.dcl \
- -DBUILD_DOC:BOOL=ON \
+ -DXML_DECL:FILEPATH=/usr/share/sgml/xml.dcl \
+ -DBUILD_DOC:BOOL=ON \
%else
- -DPREBUILT_DOC:BOOL=ON \
+ -DPREBUILT_DOC:BOOL=ON \
%endif
- -DBUILD_TEST:BOOL=ON
+ -DBUILD_TEST:BOOL=ON
# --debug-output --debug-trycompile \
#
make %{?_smp_flags} VERBOSE=1
@@ -337,16 +372,20 @@ do
cat tclIndex.hd tclIndex > ${file}
done
+rm -rf $RPM_BUILD_ROOT%{_datadir}/plplot%{version}/examples/cmake/modules/Platform
+
%check
cd fedora
#Hack
export ITCL_LIBRARY=%{_libdir}/tcl8.5/itcl3.4
-# Exclude perl and compare tests for now, and ocaml from ppc/ppc64
+# Exclude compare tests for now, and ocaml from ppc/ppc64
+# The *qt tests requires an X server, but Xvfb is segfaulting
+# http://bugs.freedesktop.org/show_bug.cgi?id=23815
%ifarch ppc ppc64
-ctest -V -E 'compare|ocaml'
+xvfb-run -f `mktemp` -e /dev/stderr ctest -V -E 'compare|ocaml|qt'
%else
-ctest -V -E 'compare'
+xvfb-run -f `mktemp` -e /dev/stderr ctest -V -E 'compare|qt'
%endif
@@ -373,6 +412,9 @@ fi
%postun octave -p /sbin/ldconfig
%endif
+%post qt -p /sbin/ldconfig
+%postun qt -p /sbin/ldconfig
+
%post tk -p /sbin/ldconfig
%postun tk -p /sbin/ldconfig
@@ -391,14 +433,17 @@ fi
%{python_sitearch}/plplot.py*
%{python_sitearch}/plplot_widgetmodule.so
%{python_sitearch}/plplotc.py*
+%{python_sitearch}/Plframe.py*
+%{python_sitearch}/TclSup.py*
%{_infodir}/plplotdoc.info*
%{_mandir}/man1/plm2gif.1.gz
%{_mandir}/man1/plpr.1.gz
%{_mandir}/man1/pltek.1.gz
%{_mandir}/man1/pstex2eps.1.gz
%dir %{_datadir}/plplot%{version}
-%{_datadir}/plplot%{version}/*.map
%{_datadir}/plplot%{version}/*.fnt
+%{_datadir}/plplot%{version}/*.map
+%{_datadir}/plplot%{version}/*.pal
%dir %{_datadir}/plplot%{version}/examples
%{_datadir}/plplot%{version}/examples/python/
%{_datadir}/plplot%{version}/examples/test_python.sh
@@ -409,7 +454,6 @@ fi
%defattr(-,root,root,-)
%{_libdir}/libcsirocsa.so.*
%{_libdir}/libcsironn.so.*
-%{_libdir}/libnistcd.so.*
%{_libdir}/libplplotcxxd.so.*
%{_libdir}/libplplotd.so.*
%{_libdir}/libplplotf77cd.so.*
@@ -421,30 +465,16 @@ fi
%dir %{_libdir}/plplot%{version}/driversd
%{_libdir}/plplot%{version}/driversd/cairo.rc
%{_libdir}/plplot%{version}/driversd/cairo.so
-%{_libdir}/plplot%{version}/driversd/cgm.rc
-%{_libdir}/plplot%{version}/driversd/cgm.so
-%{_libdir}/plplot%{version}/driversd/dg300.rc
-%{_libdir}/plplot%{version}/driversd/dg300.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
%ifarch %{ix86} x86_64
%{_libdir}/plplot%{version}/driversd/linuxvga.rc
%{_libdir}/plplot%{version}/driversd/linuxvga.so
%endif
-%{_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
-%{_libdir}/plplot%{version}/driversd/pbm.so
%{_libdir}/plplot%{version}/driversd/ps.rc
%{_libdir}/plplot%{version}/driversd/ps.so
%{_libdir}/plplot%{version}/driversd/pstex.rc
@@ -453,8 +483,6 @@ fi
%{_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
@@ -466,7 +494,6 @@ fi
%{_includedir}/plplot/
%{_libdir}/libcsirocsa.so
%{_libdir}/libcsironn.so
-%{_libdir}/libnistcd.so
%{_libdir}/libplplotcxxd.so
%{_libdir}/libplplotd.so
%{_libdir}/libplplotf77cd.so
@@ -479,6 +506,15 @@ fi
%{_libdir}/pkgconfig/plplotd-c++.pc
%{_libdir}/pkgconfig/plplotd-f77.pc
%{_libdir}/pkgconfig/plplotd-f95.pc
+%{_datadir}/plplot%{version}/examples/CMakeLists.txt
+%dir %{_datadir}/plplot%{version}/examples/cmake
+%dir %{_datadir}/plplot%{version}/examples/cmake/modules
+%{_datadir}/plplot%{version}/examples/cmake/modules/FindPkgConfig.cmake
+%{_datadir}/plplot%{version}/examples/cmake/modules/CMakeFortranInformation.cmake
+%{_datadir}/plplot%{version}/examples/cmake/modules/export_plplot-noconfig.cmake
+%{_datadir}/plplot%{version}/examples/cmake/modules/export_plplot.cmake
+%{_datadir}/plplot%{version}/examples/cmake/modules/pkg-config.cmake
+%{_datadir}/plplot%{version}/examples/cmake/modules/plplot_configure.cmake
%{_datadir}/plplot%{version}/examples/lena.pgm
%{_datadir}/plplot%{version}/examples/c/
%{_datadir}/plplot%{version}/examples/c++/
@@ -508,6 +544,10 @@ fi
#%{_datadir}/ada/adainclude/plplotadad/
%{_datadir}/plplot%{version}/examples/ada/
%{_datadir}/plplot%{version}/examples/test_ada.sh
+%{_datadir}/plplot%{version}/examples/cmake/modules/CMakeAdaCompiler.cmake.in
+%{_datadir}/plplot%{version}/examples/cmake/modules/CMakeAdaInformation.cmake
+%{_datadir}/plplot%{version}/examples/cmake/modules/CMakeDetermineAdaCompiler.cmake
+%{_datadir}/plplot%{version}/examples/cmake/modules/CMakeTestAdaCompiler.cmake
%files java
%defattr(-,root,root,-)
@@ -558,9 +598,24 @@ fi
%files perl
%defattr(-,root,root,-)
%{_datadir}/plplot%{version}/examples/perl/
-%{_datadir}/plplot%{version}/examples/test_perl.sh
+%{_datadir}/plplot%{version}/examples/test_pdl.sh
%endif
+%files pyqt
+%defattr(-,root,root,-)
+%{python_sitearch}/plplot_pyqt4.so
+
+%files qt
+%defattr(-,root,root,-)
+%{_libdir}/libplplotqtd.so.*
+%{_libdir}/plplot%{version}/driversd/qt.rc
+%{_libdir}/plplot%{version}/driversd/qt.so
+
+%files qt-devel
+%defattr(-,root,root,-)
+%{_libdir}/libplplotqtd.so
+%{_libdir}/pkgconfig/plplotd-qt.pc
+
%files tk
%defattr(-,root,root,-)
%{_bindir}/plserver
@@ -592,11 +647,41 @@ fi
%{_libdir}/plplot%{version}/driversd/wxwidgets.so
%files wxGTK-devel
+%defattr(-,root,root,-)
%{_libdir}/libplplotwxwidgetsd.so
%{_libdir}/pkgconfig/plplotd-wxwidgets.pc
%changelog
+* Mon Sep 28 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.9.5-1
+- Update to 5.9.5
+- Disable qt tests for now until Xvfb bug is fixed.
+- Remove ocaml dep code for now - breaks other dep generation
+
+* Wed Aug 26 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.9.4-8
+- Update octave patch to hopefully fix remaining issue.
+- Re-enable tests
+
+* Wed Aug 26 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.9.4-7
+- Add patch from svn to support pdl 2.4.4_05
+- Force using gfortran
+
+* Wed Aug 26 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 5.9.4-6
+- Build with perl package re-enabled
+
+* Wed Aug 26 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 5.9.4-5
+- Temporarily disable check to fix broken deps in rawhide
+- Attempt bootstrap build without pdl
+
+* Thu Aug 13 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.9.4-4
+- Add patch to support octave 3.2
+
+* Sat Aug 01 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 5.9.4-3
+- Rebuilt against updated Octave.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.9.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
* Fri May 22 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.9.4-1
- Update to 5.9.4
- Drop soversion patch applied upstream
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/F-11/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources 26 May 2009 15:07:45 -0000 1.17
+++ sources 19 Oct 2009 20:53:30 -0000 1.18
@@ -1 +1 @@
-db172aaf0a7aa429b63d9bbd28637fd4 plplot-5.9.4.tar.gz
+214c9f984f046bee18f6a3cce2cdec39 plplot-5.9.5.tar.gz
- Previous message (by thread): rpms/gucharmap/F-12 .cvsignore, 1.24, 1.25 gucharmap.spec, 1.44, 1.45 sources, 1.24, 1.25
- Next message (by thread): rpms/gnome-terminal/F-12 .cvsignore, 1.64, 1.65 gnome-terminal.spec, 1.130, 1.131 sources, 1.65, 1.66
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list