rpms/mapserver/devel import.log,1.5,1.6 mapserver.spec,1.16,1.17

[Balint Cristian]

Author: rezso

Update of /cvs/pkgs/rpms/mapserver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13563/devel

Modified Files:
	import.log mapserver.spec 
Log Message:
- require external fonts
- get rid of internal fonts



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mapserver/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	7 Dec 2008 13:10:03 -0000	1.5
+++ import.log	3 Jan 2009 14:12:15 -0000	1.6
@@ -3,3 +3,4 @@
 mapserver-5_2_0-1_fc9:HEAD:mapserver-5.2.0-1.fc9.src.rpm:1216813802
 mapserver-5_2_1-1_fc11:HEAD:mapserver-5.2.1-1.fc11.src.rpm:1228637903
 mapserver-5_2_1-2_fc11:HEAD:mapserver-5.2.1-2.fc11.src.rpm:1228655332
+mapserver-5_2_1-3_fc11:HEAD:mapserver-5.2.1-3.fc11.src.rpm:1230991877


Index: mapserver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mapserver/devel/mapserver.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- mapserver.spec	7 Dec 2008 13:10:03 -0000	1.16
+++ mapserver.spec	3 Jan 2009 14:12:16 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           mapserver
 Version:        5.2.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Environment for building spatially-enabled internet applications
 Group:          Development/Tools
 License:        BSD
@@ -8,6 +8,8 @@
 Source:         http://download.osgeo.org/mapserver/mapserver-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       httpd
+Requires:       bitstream-vera-fonts-sans
+
 BuildRequires:  libXpm-devel
 BuildRequires:  httpd-devel php-devel
 BuildRequires:  perl(ExtUtils::MakeMaker)
@@ -80,6 +82,16 @@
 chmod -x mapscript/perl/examples/*.pl
 chmod -x mapscript/php3/README
 
+
+# remove fonts
+# alias as symlinks
+rm -rf tests/vera/Vera.ttf
+rm -rf tests/vera/VeraBd.ttf
+pushd tests/vera/
+ln -sf /usr/share/fonts/bitstream-vera/Vera.ttf Vera.ttf
+ln -sf /usr/share/fonts/bitstream-vera/Verabd.ttf VeraBd.ttf
+popd
+
 %build
 
 # fix a UTF-8 one
@@ -180,8 +192,6 @@
 for junk in {*.pod,*.bs,.packlist} ; do
 find %{buildroot} -name "$junk" -exec rm -rf '{}' \;
 done
-# remove vera fonts, these are provided system wide
-rm -rf %{buildroot}/%{_docdir}/%{name}-%{version}/tests/vera
 
 # fix some exec bits
 chmod 755 %{buildroot}/%{perl_vendorarch}/auto/mapscript/mapscript.so
@@ -230,6 +240,10 @@
 %{_javadir}/*.jar
 
 %changelog
+* Sat Jan 03 2009 Balint Cristian <rezso at rdsor.ro> 5.2.1-3
+- require external fonts
+- get rid of internal fonts
+
 * Sat Dec 07 2008 Balint Cristian <rezso at rdsor.ro> 5.2.1-2
 - enable agg render engine
 - enable fribidi renderer