rpms/plplot/F-11 import.log, NONE, 1.1 plplot-5.9.3-multiarch.patch, NONE, 1.1 plplot-5.9.3-soversion.patch, NONE, 1.1 plplot-5.9.3-test.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 plplot.spec, 1.72, 1.73 sources, 1.15, 1.16 plplot-5.9.1-multiarch.patch, 1.1, NONE plplot-5.9.1-octave.patch, 1.1, NONE plplot-5.9.2-f77.patch, 1.1, NONE plplot-5.9.2-gnat-4.4.patch, 1.1, NONE plplot-5.9.2-test.patch, 1.2, NONE
Orion Poplawski
orion at fedoraproject.org
Mon May 4 20:51:12 UTC 2009
Author: orion
Update of /cvs/pkgs/rpms/plplot/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27962/F-11
Modified Files:
.cvsignore plplot.spec sources
Added Files:
import.log plplot-5.9.3-multiarch.patch
plplot-5.9.3-soversion.patch plplot-5.9.3-test.patch
Removed Files:
plplot-5.9.1-multiarch.patch plplot-5.9.1-octave.patch
plplot-5.9.2-f77.patch plplot-5.9.2-gnat-4.4.patch
plplot-5.9.2-test.patch
Log Message:
Sync to 5.9.3 from devel
--- NEW FILE import.log ---
plplot-5_9_3-1_fc12:F-11:plplot-5.9.3-1.fc12.src.rpm:1241470222
plplot-5.9.3-multiarch.patch:
--- NEW FILE plplot-5.9.3-multiarch.patch ---
--- plplot-5.9.2/examples/c/Makefile.examples.in.multiarch 2009-04-29 15:41:24.000000000 -0600
+++ plplot-5.9.2/examples/c/Makefile.examples.in 2009-04-29 15:45:54.000000000 -0600
@@ -25,8 +25,6 @@
EXEEXT = @EXEEXT@
@pkg_config_true at LIB_TAG = @LIB_TAG@
- at pkg_config_true@PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
- at pkg_config_true@RPATHCMD = @RPATHCMD@
@gcw_true at PLPLOTCANVAS_EXECUTABLES_list = \
@gcw_true@ plplotcanvas_demo$(EXEEXT) \
@@ -80,29 +78,29 @@
rm -f $(EXECUTABLES_list)
@gcw_true at plplotcanvas_demo$(EXEEXT): plplotcanvas_demo.c
- at gcw_true@@pkg_config_true@ $(CC) $< -o $@ $(RPATHCMD) \
- at gcw_true@@pkg_config_true@ `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-gnome2`
+ at gcw_true@@pkg_config_true@ $(CC) $< -o $@ \
+ at gcw_true@@pkg_config_true@ `pkg-config --cflags --libs plplot$(LIB_TAG)-gnome2`
@gcw_true@@pkg_config_false@ $(CC) $< -o $@ \
@gcw_true@@pkg_config_false@ `plplot-config --cflags --libs --with-gcw`
@gcw_true at plplotcanvas_animation$(EXEEXT): plplotcanvas_animation.c
- at gcw_true@@pkg_config_true@ $(CC) $< -o $@ $(RPATHCMD) \
- at gcw_true@@pkg_config_true@ `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-gnome2` \
+ at gcw_true@@pkg_config_true@ $(CC) $< -o $@ \
+ at gcw_true@@pkg_config_true@ `pkg-config --cflags --libs plplot$(LIB_TAG)-gnome2` \
@gcw_true@@pkg_config_true@ `pkg-config --cflags --libs gthread-2.0`
@gcw_true@@pkg_config_false@ $(CC) $< -o \
@gcw_true@@pkg_config_false@ $@ `plplot-config --cflags --libs --with-gcw` \
@gcw_true@@pkg_config_false@ @GCWTHREAD_CFLAGS@ @GCWTHREAD_LIBS@
@extXdrawable_true@@pkg_config_true at extXdrawable_demo$(EXEEXT): extXdrawable_demo.c
- at extXdrawable_true@@pkg_config_true@ $(CC) $< -o $@ $(RPATHCMD) \
- at extXdrawable_true@@pkg_config_true@ `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG) gtk+-x11-2.0`
+ at extXdrawable_true@@pkg_config_true@ $(CC) $< -o $@ \
+ at extXdrawable_true@@pkg_config_true@ `pkg-config --cflags --libs plplot$(LIB_TAG) gtk+-x11-2.0`
@extcairo_true@@pkg_config_true at ext-cairo-test$(EXEEXT): ext-cairo-test.c
- at extcairo_true@@pkg_config_true@ $(CC) $< -o $@ $(RPATHCMD) \
- at extcairo_true@@pkg_config_true@ `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG) cairo`
+ at extcairo_true@@pkg_config_true@ $(CC) $< -o $@ \
+ at extcairo_true@@pkg_config_true@ `pkg-config --cflags --libs plplot$(LIB_TAG) cairo`
.c$(EXEEXT):
- at pkg_config_true@ $(CC) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)`
+ at pkg_config_true@ $(CC) $< -o $@ `pkg-config --cflags --libs plplot$(LIB_TAG)`
@pkg_config_false@ $(CC) $< -o $@ `plplot-config --cflags --libs`
.SUFFIXES: .c $(EXEEXT)
--- plplot-5.9.2/examples/c++/Makefile.examples.in.multiarch 2009-04-29 15:41:25.000000000 -0600
+++ plplot-5.9.2/examples/c++/Makefile.examples.in 2009-04-29 15:46:49.000000000 -0600
@@ -25,10 +25,7 @@
EXEEXT = @EXEEXT@
@pkg_config_true at LIB_TAG = @LIB_TAG@
- at pkg_config_true@PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
- at pkg_config_true@RPATHCMD = @RPATHCMD@
@qt_gui_true at QT_MOC_EXECUTABLE = @QT_MOC_EXECUTABLE@
- at qt_gui_true@@pkg_config_true at qt_RPATHCMD = @qt_RPATHCMD@
@wxwidgets_true@@pkg_config_true at PLPLOTWXWIDGETS_EXECUTABLES_list = \
@wxwidgets_true@@pkg_config_true@ wxPLplotDemo$(EXEEXT)
@@ -79,16 +76,16 @@
rm -f $(EXECUTABLES_list)
@wxwidgets_true@@pkg_config_true at wxPLplotDemo$(EXEEXT): wxPLplotDemo.cpp
- at wxwidgets_true@@pkg_config_true@ $(CXX) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-wxwidgets`
+ at wxwidgets_true@@pkg_config_true@ $(CXX) $< -o $@ `pkg-config --cflags --libs plplot$(LIB_TAG)-wxwidgets`
@qt_gui_true@@pkg_config_true at moc_qt_PlotWindow.cpp: qt_PlotWindow.h
@qt_gui_true@@pkg_config_true@ $(QT_MOC_EXECUTABLE) `$(PKG_CONFIG_ENV) pkg-config --cflags plplot$(LIB_TAG)-qt` $< -o $@
@qt_gui_true@@pkg_config_true at qt_example$(EXEEXT): qt_example.cpp qt_PlotWindow.cpp moc_qt_PlotWindow.cpp
- at qt_gui_true@@pkg_config_true@ $(CXX) qt_example.cpp qt_PlotWindow.cpp moc_qt_PlotWindow.cpp -o $@ $(qt_RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-qt`
+ at qt_gui_true@@pkg_config_true@ $(CXX) qt_example.cpp qt_PlotWindow.cpp moc_qt_PlotWindow.cpp -o $@ `pkg-config --cflags --libs plplot$(LIB_TAG)-qt`
.cc$(EXEEXT):
- at pkg_config_true@ $(CXX) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-c++`
+ at pkg_config_true@ $(CXX) $< -o $@ `pkg-config --cflags --libs plplot$(LIB_TAG)-c++`
@pkg_config_false@ $(CXX) $< -o $@ `plplot-config --cflags --libs --with-c++`
.SUFFIXES: .cc $(EXEEXT)
--- plplot-5.9.2/examples/f77/Makefile.examples.in.multiarch 2009-01-18 13:24:12.000000000 -0700
+++ plplot-5.9.2/examples/f77/Makefile.examples.in 2009-04-29 15:41:41.000000000 -0600
@@ -25,8 +25,6 @@
EXEEXT = @EXEEXT@
@pkg_config_true at LIB_TAG = @LIB_TAG@
- at pkg_config_true@PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
- at pkg_config_true@RPATHCMD = @RPATHCMD@
EXECUTABLES_list = \
x01f$(EXEEXT) \
@@ -69,7 +67,7 @@
rm -f $(EXECUTABLES_list)
.f$(EXEEXT):
- at pkg_config_true@ $(F77) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-f77`
+ at pkg_config_true@ $(F77) $< -o $@ `pkg-config --cflags --libs plplot$(LIB_TAG)-f77`
@pkg_config_false@ $(F77) $< -o $@ `plplot-config --cflags --libs --with-f77`
.SUFFIXES: .f $(EXEEXT)
--- plplot-5.9.2/examples/f95/Makefile.examples.in.multiarch 2009-01-18 13:24:12.000000000 -0700
+++ plplot-5.9.2/examples/f95/Makefile.examples.in 2009-04-29 15:41:40.000000000 -0600
@@ -25,8 +25,6 @@
EXEEXT = @EXEEXT@
@pkg_config_true at LIB_TAG = @LIB_TAG@
- at pkg_config_true@PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
- at pkg_config_true@RPATHCMD = @RPATHCMD@
EXECUTABLES_list = \
x01f$(EXEEXT) \
@@ -68,7 +66,7 @@
rm -f $(EXECUTABLES_list)
.f90$(EXEEXT):
- at pkg_config_true@ $(F95) @MODULESINCCMD@ $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-f95`
+ at pkg_config_true@ $(F95) @MODULESINCCMD@ $< -o $@ `pkg-config --cflags --libs plplot$(LIB_TAG)-f95`
@pkg_config_false@ $(F95) @MODULESINCCMD@ $< -o $@ `plplot-config --cflags --libs --with-f95`
.SUFFIXES: .f90 $(EXEEXT)
--- plplot-5.9.2/examples/tk/Makefile.examples.in.multiarch 2009-04-29 15:41:30.000000000 -0600
+++ plplot-5.9.2/examples/tk/Makefile.examples.in 2009-04-29 15:43:55.000000000 -0600
@@ -24,8 +24,6 @@
EXEEXT = @EXEEXT@
@pkg_config_true at LIB_TAG = @LIB_TAG@
- at pkg_config_true@PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
- at pkg_config_true@RPATHCMD = @RPATHCMD@
EXECUTABLES_list = xtk01$(EXEEXT)
# Second and fourth examples depend on itk.
@@ -37,7 +35,7 @@
rm -f $(EXECUTABLES_list) $(itk_EXECUTABLES_list)
.c$(EXEEXT):
- at pkg_config_true@ $(CC) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-tcl`
+ at pkg_config_true@ $(CC) $< -o $@ `pkg-config --cflags --libs plplot$(LIB_TAG)-tcl`
@pkg_config_false@ $(CC) $< -o $@ `plplot-config --cflags --libs --with-tcl`
.SUFFIXES: .c $(EXEEXT)
plplot-5.9.3-soversion.patch:
--- NEW FILE plplot-5.9.3-soversion.patch ---
--- plplot-5.9.3/cmake/modules/plplot_version.cmake.soversion 2009-04-28 14:49:37.000000000 -0600
+++ plplot-5.9.3/cmake/modules/plplot_version.cmake 2009-05-04 11:42:42.000000000 -0600
@@ -28,7 +28,7 @@
# library version numbers the same for the release.
set(nistcd_SOVERSION 0)
-set(nistcd_VERSION ${nist_SOVERSION}.0.1)
+set(nistcd_VERSION ${nistcd_SOVERSION}.0.1)
set(csirocsa_SOVERSION 0)
set(csirocsa_VERSION ${csirocsa_SOVERSION}.0.1)
plplot-5.9.3-test.patch:
--- NEW FILE plplot-5.9.3-test.patch ---
--- plplot-5.9.2/plplot_test/plplot-test.sh.cmake.test 2009-04-29 15:57:13.000000000 -0600
+++ plplot-5.9.2/plplot_test/plplot-test.sh.cmake 2009-04-29 16:03:50.000000000 -0600
@@ -34,8 +34,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
@@ -145,18 +146,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
@@ -292,21 +281,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 perl"
- 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
@@ -332,9 +318,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.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore 30 Jan 2009 16:50:01 -0000 1.15
+++ .cvsignore 4 May 2009 20:50:41 -0000 1.16
@@ -1 +1 @@
-plplot-5.9.2.tar.gz
+plplot-5.9.3.tar.gz
Index: plplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/F-11/plplot.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- plplot.spec 27 Mar 2009 21:17:59 -0000 1.72
+++ plplot.spec 4 May 2009 20:50:42 -0000 1.73
@@ -9,19 +9,18 @@
%bcond_without pdl
Name: plplot
-Version: 5.9.2
-Release: 4%{?dist}
+Version: 5.9.3
+Release: 1%{?dist}
Summary: Library of functions for making scientific plots
Group: Applications/Engineering
License: LGPLv2+
URL: http://plplot.sourceforge.net/
Source0: http://downloads.sourceforge.net/plplot/%{name}-%{version}.tar.gz
-Patch1: plplot-5.9.1-multiarch.patch
+Patch1: plplot-5.9.3-multiarch.patch
Patch2: plplot-5.9.2-info.patch
-Patch3: plplot-5.9.2-gnat-4.4.patch
-Patch4: plplot-5.9.2-f77.patch
-Patch5: plplot-5.9.2-test.patch
+Patch3: plplot-5.9.3-soversion.patch
+Patch5: plplot-5.9.3-test.patch
Patch6: plplot-5.7.3-jni.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -55,14 +54,17 @@ BuildRequires: svgalib-devel
%if %{with doc}
BuildRequires: texlive, texinfo, openjade, jadetex, docbook2X, docbook-style-dsssl
%endif
+%ifnarch sparc64 s390 s390x
BuildRequires: ocaml, ocaml-findlib, ocaml-camlidl-devel
-Requires(post): /sbin/ldconfig
+%endif
+BuildRequires: lua-devel
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info
Requires: gnu-free-mono-fonts
Requires: gnu-free-sans-fonts
Requires: gnu-free-serif-fonts
Requires: numpy
+Obsoletes: %{name}-gnome <= %{version}-%{release}
%description
@@ -93,6 +95,7 @@ the png and jpeg drivers that uses the F
%package libs
Summary: Libraries for PLplot
Group: Development/Libraries
+Requires(post): /sbin/ldconfig
%description libs
%{summary}.
@@ -131,27 +134,6 @@ Requires: gcc-gnat
%{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}-devel = %{version}-%{release}
-Requires: %{name}-gnome = %{version}-%{release}
-Requires: pkgconfig
-Requires: libgnomecanvas-devel, libgnomeprintui22-devel
-
-%description gnome-devel
-%{summary}.
-
-
%package java
Summary: Functions for scientific plotting with Java
Group: Development/Libraries
@@ -172,6 +154,17 @@ Requires: %{name}-java = %{version
%{summary}.
+%package lua
+Summary: Functions for scientific plotting with Lua
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: lua
+
+%description lua
+%{summary}.
+
+
+%ifnarch sparc64 s390 s390x
%package ocaml
Summary: Functions for scientific plotting with OCaml
Group: Development/Libraries
@@ -193,6 +186,7 @@ Provides: ocaml-plplot-devel = %{v
%description ocaml-devel
%{summary}.
+%endif
%if %{with octave}
@@ -261,11 +255,17 @@ Requires: pkgconfig
%prep
%setup -q
%patch1 -p1 -b .multiarch
-%patch2 -p1 -b .orig
-%patch3 -p1 -b .gnat-4.4
-%patch4 -p1 -b .f77
+%patch2 -p1 -b .info
+%patch3 -p1 -b .soversion
%patch5 -p1 -b .test
%patch6 -p1 -b .jni
+# Convert to UTF-8
+for file in ChangeLog NEWS
+do
+ iconv -f ISO-8859-1 -t UTF-8 $file > ${file}.tmp
+ touch -r $file ${file}.tmp
+ mv ${file}.tmp $file
+done
%build
@@ -278,17 +278,18 @@ export FFLAGS="$RPM_OPT_FLAGS"
unset TERM
%cmake .. \
-DCMAKE_SKIP_RPATH:BOOL=OFF \
- -DCMAKE_INSTALL_RPATH:PATH="" \
+ -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_pygcw:BOOL=ON \
-DENABLE_tk:BOOL=ON \
-DHAVE_PTHREAD:BOOL=ON \
-DPL_FREETYPE_FONT_PATH:PATH="/usr/share/fonts/gnu-free" \
@@ -355,7 +356,6 @@ rm -rf $RPM_BUILD_ROOT
%post
-/sbin/ldconfig
/sbin/install-info %{_infodir}/plplotdoc.info %{_infodir}/dir || :
%preun
@@ -363,26 +363,23 @@ if [ $1 = 0 ]; then
/sbin/install-info --delete %{_infodir}/plplotdoc.info %{_infodir}/dir || :
fi
-%postun -p /sbin/ldconfig
-
-%post ada -p /sbin/ldconfig
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
+%post ada -p /sbin/ldconfig
%postun ada -p /sbin/ldconfig
-%post gnome -p /sbin/ldconfig
-
-%postun gnome -p /sbin/ldconfig
-
%if %{with octave}
-%post octave -p /sbin/ldconfig
-
+%post octave -p /sbin/ldconfig
%postun octave -p /sbin/ldconfig
%endif
-%post tk -p /sbin/ldconfig
-
+%post tk -p /sbin/ldconfig
%postun tk -p /sbin/ldconfig
+%post wxGTK -p /sbin/ldconfig
+%postun wxGTK -p /sbin/ldconfig
+
%files
%defattr(-,root,root,-)
@@ -395,7 +392,6 @@ fi
%{python_sitearch}/plplot.py*
%{python_sitearch}/plplot_widgetmodule.so
%{python_sitearch}/plplotc.py*
-%{python_sitearch}/plplotcanvas.py*
%{_infodir}/plplotdoc.info*
%{_mandir}/man1/plm2gif.1.gz
%{_mandir}/man1/plpr.1.gz
@@ -414,20 +410,22 @@ fi
%defattr(-,root,root,-)
%{_libdir}/libcsirocsa.so.*
%{_libdir}/libcsironn.so.*
+%{_libdir}/libnistcd.so.*
%{_libdir}/libplplotcxxd.so.*
%{_libdir}/libplplotd.so.*
%{_libdir}/libplplotf77cd.so.*
%{_libdir}/libplplotf77d.so.*
%{_libdir}/libplplotf95cd.so.*
%{_libdir}/libplplotf95d.so.*
+%{_libdir}/libqsastime.so.*
%dir %{_libdir}/plplot%{version}
%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/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
@@ -469,12 +467,14 @@ fi
%{_includedir}/plplot/
%{_libdir}/libcsirocsa.so
%{_libdir}/libcsironn.so
+%{_libdir}/libnistcd.so
%{_libdir}/libplplotcxxd.so
%{_libdir}/libplplotd.so
%{_libdir}/libplplotf77cd.so
%{_libdir}/libplplotf77d.so
%{_libdir}/libplplotf95cd.so
%{_libdir}/libplplotf95d.so
+%{_libdir}/libqsastime.so
%{_libdir}/fortran/
%{_libdir}/pkgconfig/plplotd.pc
%{_libdir}/pkgconfig/plplotd-c++.pc
@@ -483,7 +483,6 @@ fi
%{_datadir}/plplot%{version}/examples/lena.pgm
%{_datadir}/plplot%{version}/examples/c/
%{_datadir}/plplot%{version}/examples/c++/
-%{_datadir}/plplot%{version}/examples/d/
%{_datadir}/plplot%{version}/examples/f77/
%{_datadir}/plplot%{version}/examples/f95/
%{_datadir}/plplot%{version}/examples/Makefile
@@ -511,19 +510,6 @@ fi
%{_datadir}/plplot%{version}/examples/ada/
%{_datadir}/plplot%{version}/examples/test_ada.sh
-%files gnome
-%defattr(-,root,root,-)
-%{_libdir}/libplplotgnome2d.so.*
-%{_libdir}/plplot%{version}/driversd/gcw.rc
-%{_libdir}/plplot%{version}/driversd/gcw.so
-%{python_sitearch}/gcwmodule.so
-%{python_sitearch}/cplplotcanvasmodule.so
-
-%files gnome-devel
-%defattr(-,root,root,-)
-%{_libdir}/libplplotgnome2d.so
-%{_libdir}/pkgconfig/plplotd-gnome2.pc
-
%files java
%defattr(-,root,root,-)
%{_libdir}/plplot%{version}/plplotjavac_wrap.so
@@ -534,6 +520,13 @@ fi
%{_datadir}/plplot%{version}/examples/java/
%{_datadir}/plplot%{version}/examples/test_java.sh
+%files lua
+%defattr(-,root,root,-)
+%{_libdir}/lua/5.1/plplot/
+%{_datadir}/plplot%{version}/examples/lua/
+%{_datadir}/plplot%{version}/examples/test_lua.sh
+
+%ifnarch sparc64 s390 s390x
%files ocaml
%defattr(-,root,root,-)
%dir %{_libdir}/ocaml/plplot/
@@ -541,14 +534,15 @@ fi
%{_libdir}/ocaml/plplot/*.cma
%{_libdir}/ocaml/plplot/*.cmi
%{_libdir}/ocaml/stublibs/*
-%{_datadir}/plplot%{version}/examples/ocaml/
-%{_datadir}/plplot%{version}/examples/test_ocaml.sh
%files ocaml-devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/plplotd-ocaml.pc
%{_libdir}/ocaml/plplot/*.a
%{_libdir}/ocaml/plplot/*.cmxa
+%{_datadir}/plplot%{version}/examples/ocaml/
+%{_datadir}/plplot%{version}/examples/test_ocaml.sh
+%endif
%if %{with octave}
%files octave
@@ -604,6 +598,25 @@ fi
%changelog
+* Mon May 4 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.9.3-1
+- Update to 5.9.3
+- Drop gnat-4.4 and f77 patches fixed upstream
+- Updated multiarch and test patches
+- Add patch to fix up libnistcd.so soversion
+- Convert some doc files to UTF-8
+- Add lua and lua-devel sub-packages
+- Remove rpaths
+- Drop gcw driver and pygcw/gnome bindings deprecated upstream
+- Drop gd driver deprecated upstream
+- Move ldconfig run to plplot-libs, and add to plplot-wxGTK
+
+* Thu Apr 16 2009 Orion Poplawski <orion at cora.nwra.com>
+- Only disable ocaml support on sparc64, s390, s390x
+
+* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org>
+- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
+ (added sparc64 per request from the sparc maintainer)
+
* Fri Mar 27 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.9.2-4
- Enable ada on ppc64 (resolves bug#241233)
- freefont is now gnu-free-{mono,sans,serif}-fonts
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/F-11/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources 30 Jan 2009 16:50:06 -0000 1.15
+++ sources 4 May 2009 20:50:42 -0000 1.16
@@ -1 +1 @@
-2a14753112083badab87f1806cc12a46 plplot-5.9.2.tar.gz
+ee5ee8bd539c203c1e045bd4368c0a4c plplot-5.9.3.tar.gz
--- plplot-5.9.1-multiarch.patch DELETED ---
--- plplot-5.9.1-octave.patch DELETED ---
--- plplot-5.9.2-f77.patch DELETED ---
--- plplot-5.9.2-gnat-4.4.patch DELETED ---
--- plplot-5.9.2-test.patch DELETED ---
More information about the fedora-extras-commits
mailing list