rpms/plplot/devel plplot-5.6.1-font.patch, NONE, 1.1 plplot-5.6.1-octave.patch, 1.1, 1.2 plplot.spec, 1.22, 1.23

Orion Poplawski (orion) fedora-extras-commits at redhat.com
Thu Nov 2 16:31:30 UTC 2006 

Author: orion

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

Modified Files:
	plplot-5.6.1-octave.patch plplot.spec 
Added Files:
	plplot-5.6.1-font.patch 
Log Message:
- Point to the freefont package properly (bug #210517)
- Move libriaries to -libs, -devel requires -libs for multilib support


plplot-5.6.1-font.patch:

--- NEW FILE plplot-5.6.1-font.patch ---
--- plplot-5.6.1/configure.font	2006-11-01 16:59:20.000000000 -0700
+++ plplot-5.6.1/configure	2006-11-01 16:59:58.000000000 -0700
@@ -23552,21 +23552,7 @@
 ;;
 esac
 
-# Check one of the usual fonts and the symbol font.
-# If they are not found, warn and turn off freetype.
-if test "$with_freetype" = "yes"; then
-    if test -r "$with_freetype_font_dir/$with_freetype_sans_font" -o -r "$with_freetype_font_dir/$with_symbol_font" ; then
-       freetype_font_dir="$with_freetype_font_dir"
-    fi
-    if test -z "$freetype_font_dir" ; then
-        { echo "$as_me:$LINENO: WARNING: \"freetype fonts not found - please check fonts.  Freetype font support is disabled.\"," >&5
-echo "$as_me: WARNING: \"freetype fonts not found - please check fonts.  Freetype font support is disabled.\"," >&2;}
-	with_freetype=no
-    else
-        echo "$as_me:$LINENO: result: fonts found in $freetype_font_dir" >&5
-echo "${ECHO_T}fonts found in $freetype_font_dir" >&6
-    fi
-fi
+freetype_font_dir="$with_freetype_font_dir"
 
 if test "$with_freetype" = "yes"; then
 

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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plplot-5.6.1-octave.patch	7 Aug 2006 21:39:24 -0000	1.1
+++ plplot-5.6.1-octave.patch	2 Nov 2006 16:30:59 -0000	1.2
@@ -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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- plplot.spec	6 Oct 2006 20:13:17 -0000	1.22
+++ plplot.spec	2 Nov 2006 16:30:59 -0000	1.23
@@ -2,7 +2,7 @@
 
 Name:           plplot
 Version:        5.6.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Library of functions for making scientific plots
 
 Group:          Applications/Engineering
@@ -12,6 +12,7 @@
 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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -25,6 +26,7 @@
 BuildRequires:  wxGTK-devel
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
+Requires:       freefont
 
 %description
 PLplot is a library of functions that are useful for making scientific
@@ -51,10 +53,18 @@
 the png and jpeg drivers that uses the Freetype library.
 
 
+%package        libs
+Summary:        Libraries for PLplot
+Group:          Development/Libraries
+
+%description    libs
+%{summary}.
+
+
 %package        devel
 Summary:        Development headers and libraries for PLplot
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}-libs = %{version}-%{release}
 Requires:       pkgconfig
 Requires:       qhull-devel, freetype-devel
 
@@ -145,12 +155,13 @@
 %patch0 -p1 -b .orig
 %patch1 -p1 -b .octave
 %patch2 -p1 -b .orig
+%patch3 -p1 -b .font
 %patch6 -p1 -b .orig
 
 
 %build
 %configure --enable-f95 --disable-static --without-rpath --with-pthreads \
-           --with-freetype-font-dir=/usr/share/fonts \
+           --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
@@ -206,14 +217,6 @@
 %{_bindir}/plrender
 %{_bindir}/pltek
 %{_bindir}/pstex2eps
-%{_libdir}/libcsirocsa.so.*
-%{_libdir}/libcsironn.so.*
-%{_libdir}/libplplotcxxd.so.*
-%{_libdir}/libplplotd.so.*
-%{_libdir}/libplplotf77cd.so.*
-%{_libdir}/libplplotf77d.so.*
-%{_libdir}/libplplotf95cd.so.*
-%{_libdir}/libplplotf95d.so.*
 %dir %{_libdir}/plplot%{version}
 %dir %{_libdir}/plplot%{version}/driversd
 %{_libdir}/plplot%{version}/driversd/gd.rc
@@ -258,6 +261,17 @@
 %{_datadir}/plplot%{version}/examples/test_tcl.sh
 %{_datadir}/plplot%{version}/examples/plplot-test.sh
 
+%files libs
+%defattr(-,root,root,-)
+%{_libdir}/libcsirocsa.so.*
+%{_libdir}/libcsironn.so.*
+%{_libdir}/libplplotcxxd.so.*
+%{_libdir}/libplplotd.so.*
+%{_libdir}/libplplotf77cd.so.*
+%{_libdir}/libplplotf77d.so.*
+%{_libdir}/libplplotf95cd.so.*
+%{_libdir}/libplplotf95d.so.*
+
 %files devel
 %defattr(-,root,root,-)
 %{_bindir}/plplot-config
@@ -347,6 +361,10 @@
 
 
 %changelog
+* Thu Nov  2 2006 - Orion Poplawski <orion at cora.nwra.com> - 5.6.1-8
+- Point to the freefont package properly (bug #210517)
+- Move libriaries to -libs, -devel requires -libs for multilib support
+
 * Fri Oct  6 2006 - Orion Poplawski <orion at cora.nwra.com> - 5.6.1-7
 - Rebuild for new octave API version

More information about the scm-commits mailing list