rpms/libwmf/devel libwmf.spec,1.30,1.31

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/libwmf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25374

Modified Files:
	libwmf.spec 
Log Message:
remove archaic duplicate fonts


Index: libwmf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libwmf/devel/libwmf.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- libwmf.spec	15 Feb 2007 18:47:50 -0000	1.30
+++ libwmf.spec	24 May 2007 16:14:21 -0000	1.31
@@ -1,7 +1,7 @@
 Summary: Windows Metafile Library
 Name: libwmf
 Version: 0.2.8.4
-Release: 14%{?dist}
+Release: 15%{?dist}
 Group: System Environment/Libraries
 License: LGPL
 Source: http://downloads.sourceforge.net/wvware/%{name}-%{version}.tar.gz
@@ -14,6 +14,7 @@
 Patch4: libwmf-0.2.8.4-multiarchdevel.patch
 Patch5: libwmf-0.2.8.4-intoverflow.patch
 Patch6: libwmf-0.2.8.4-reducesymbols.patch
+Requires: urw-fonts
 Requires(post): %{_bindir}/update-gdk-pixbuf-loaders
 Requires(postun): %{_bindir}/update-gdk-pixbuf-loaders
 BuildRequires: gtk2-devel, libtool, libxml2-devel, gd-devel, libpng-devel
@@ -61,6 +62,10 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/*/loaders/*.la
 rm -rf $RPM_BUILD_ROOT%{_includedir}/libwmf/gd
 find doc -name "Makefile*" -exec rm {} \;
+#we're carrying around duplicate fonts
+rm -rf $RPM_BUILD_ROOT%{_datadir}/libwmf/fonts/*afm
+rm -rf $RPM_BUILD_ROOT%{_datadir}/libwmf/fonts/*pfb
+sed -i $RPM_BUILD_ROOT%{_datadir}/libwmf/fonts/fontmap -e 's#libwmf/fonts#fonts/default/Type1#g'
 
 %post
 /sbin/ldconfig
@@ -81,7 +86,7 @@
 %{_bindir}/wmf2fig
 %{_bindir}/wmf2x
 %{_bindir}/libwmf-fontmap
-%{_datadir}/libwmf
+%{_datadir}/libwmf/
 
 %files devel
 %defattr(-,root,root,-)
@@ -99,6 +104,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Thu May 24 2007 Caolan McNamara <caolanm at redhat.com> 0.2.8.4-15
+- drop duplicate font metrics
+
 * Thu Feb 15 2007 Caolan McNamara <caolanm at redhat.com> 0.2.8.4-14
 - remove use of archaic autotools