rpms/plplot/devel plplot-5.9.2-f77.patch, NONE, 1.1 plplot-5.9.2-gnat-4.4.patch, NONE, 1.1 plplot-5.9.2-test.patch, NONE, 1.1 plplot.spec, 1.67, 1.68
Orion Poplawski
orion at fedoraproject.org
Fri Feb 13 22:52:09 UTC 2009
Author: orion
Update of /cvs/pkgs/rpms/plplot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31603
Modified Files:
plplot.spec
Added Files:
plplot-5.9.2-f77.patch plplot-5.9.2-gnat-4.4.patch
plplot-5.9.2-test.patch
Log Message:
* Thu Feb 12 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.9.2-2
- Add patch to find gnat 4.4
- Add patch to fix f77 example
- Define HAVE_ADA_2007
- Add patch to allow users to run plplot-test.sh (bug #484519)
- Move more tcl files into tk package, examples into main tk package
plplot-5.9.2-f77.patch:
--- NEW FILE plplot-5.9.2-f77.patch ---
--- plplot-5.9.2/examples/f77/x23f.fm4.f77 2009-01-18 13:24:12.000000000 -0700
+++ plplot-5.9.2/examples/f77/x23f.fm4 2009-02-12 08:17:36.000000000 -0700
@@ -41,6 +41,8 @@
integer PL_PARSE_FULL
parameter(PL_PARSE_FULL = 1)
+ integer*8 PL_INT_0
+ parameter(PL_INT_0 = 0)
C
C Displays Greek letters and mathematically interesting Unicode ranges
@@ -323,7 +325,7 @@
call pladv(0)
call plvpor(0.02d0, 0.98d0, 0.02d0, 0.90d0)
call plwind(0.0d0, 1.0d0, 0.0d0, 1.0d0)
- call plsfci(0)
+ call plsfci(PL_INT_0)
if (page == 11) then
call plmtex('t', 1.5d0, 0.5d0, 0.5d0,
& '#<0x10>PLplot Example 23 - '//
plplot-5.9.2-gnat-4.4.patch:
--- NEW FILE plplot-5.9.2-gnat-4.4.patch ---
--- plplot-5.9.2/cmake/modules/ada.cmake.gnat-4.4 2009-01-18 13:24:12.000000000 -0700
+++ plplot-5.9.2/cmake/modules/ada.cmake 2009-01-26 10:02:25.000000000 -0700
@@ -26,7 +26,7 @@
endif(DEFAULT_NO_BINDINGS)
if(ENABLE_ada)
- find_library(GNAT_LIB NAMES gnat gnat-4.1 gnat-4.2 gnat-4.3)
+ find_library(GNAT_LIB NAMES gnat gnat-4.1 gnat-4.2 gnat-4.3 gnat-4.4)
if(NOT GNAT_LIB)
message(STATUS "WARNING: "
"gnat library not found. Disabling ada bindings")
plplot-5.9.2-test.patch:
--- NEW FILE plplot-5.9.2-test.patch ---
--- plplot-5.9.2/plplot_test/plplot-test.sh.cmake.test 2009-01-18 13:24:12.000000000 -0700
+++ plplot-5.9.2/plplot_test/plplot-test.sh.cmake 2009-02-13 12:20:46.000000000 -0700
@@ -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
@@ -143,18 +144,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
@@ -279,19 +268,17 @@
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"
+ 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_perl@ \
+ ada:@ENABLE_ada@ ocaml:@ENABLE_ocaml@
+ 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
@@ -309,9 +296,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: plplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/devel/plplot.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- plplot.spec 30 Jan 2009 16:50:06 -0000 1.67
+++ plplot.spec 13 Feb 2009 22:52:08 -0000 1.68
@@ -10,7 +10,7 @@
Name: plplot
Version: 5.9.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Library of functions for making scientific plots
Group: Applications/Engineering
@@ -19,6 +19,9 @@
Source0: http://downloads.sourceforge.net/plplot/%{name}-%{version}.tar.gz
Patch1: plplot-5.9.1-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
Patch6: plplot-5.7.3-jni.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -27,9 +30,7 @@
# Ada is not available on ppc64 and not working on x86_64
%ifnarch ppc64
BuildRequires: gcc-gnat
-%define build_ada -DENABLE_ada:BOOL=ON
-#Cannot use -DHAVE_ADA_2007:BOOL=ON
-#see https://bugzilla.redhat.com/show_bug.cgi?id=473811
+%define build_ada -DENABLE_ada:BOOL=ON -DHAVE_ADA_2007:BOOL=ON
%else
%define build_ada %{nil}
%endif
@@ -263,6 +264,9 @@
%setup -q
%patch1 -p1 -b .multiarch
%patch2 -p1 -b .orig
+%patch3 -p1 -b .gnat-4.4
+%patch4 -p1 -b .f77
+%patch5 -p1 -b .test
%patch6 -p1 -b .jni
@@ -401,12 +405,9 @@
%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
%{_datadir}/plplot%{version}/examples/plplot-test-interactive.sh
@@ -580,6 +581,11 @@
%{_libdir}/plplot%{version}/driversd/tk.so
%{_libdir}/plplot%{version}/driversd/tkwin.rc
%{_libdir}/plplot%{version}/driversd/tkwin.so
+%{_datadir}/plplot%{version}/pkgIndex.tcl
+%{_datadir}/plplot%{version}/examples/test_tcl.sh
+%{_datadir}/plplot%{version}/examples/tcl/
+%{_datadir}/plplot%{version}/examples/tk/
+%{_datadir}/plplot%{version}/tcl/
%{_mandir}/man1/plserver.1.gz
%{_mandir}/man1/pltcl.1.gz
@@ -588,8 +594,6 @@
%{_libdir}/libplplottcltkd.so
%{_libdir}/libtclmatrixd.so
%{_libdir}/pkgconfig/plplotd-tcl.pc
-%{_datadir}/plplot%{version}/examples/tcl/
-%{_datadir}/plplot%{version}/examples/tk/
%files wxGTK
%defattr(-,root,root,-)
@@ -603,6 +607,13 @@
%changelog
+* Thu Feb 12 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.9.2-2
+- Add patch to find gnat 4.4
+- Add patch to fix f77 example
+- Define HAVE_ADA_2007
+- Add patch to allow users to run plplot-test.sh (bug #484519)
+- Move more tcl files into tk package, examples into main tk package
+
* Mon Jan 26 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.9.2-1
- Update to 5.9.2
- Need rpaths during build
More information about the fedora-extras-commits
mailing list