rpms/plplot/FC-6 plplot-5.6.1-font.patch, NONE, 1.1 plplot.spec, 1.22, 1.23

[Orion Poplawski (orion)]

Author: orion

Update of /cvs/extras/rpms/plplot/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14667/FC-6

Modified Files:
	plplot.spec 
Added Files:
	plplot-5.6.1-font.patch 
Log Message:
Point to the freefont package properly (bug #210517)


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
 


Index: plplot.spec
===================================================================
RCS file: /cvs/extras/rpms/plplot/FC-6/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:17:14 -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
@@ -145,12 +147,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
@@ -347,6 +350,9 @@
 
 
 %changelog
+* Thu Nov  2 2006 - Orion Poplawski <orion at cora.nwra.com> - 5.6.1-8
+- Point to the freefont package properly (bug #210517)
+
 * Fri Oct  6 2006 - Orion Poplawski <orion at cora.nwra.com> - 5.6.1-7
 - Rebuild for new octave API version