From e04634688c4fac40bc49a4519bf973d39d5ec74b Mon Sep 17 00:00:00 2001
From: Jameson Pugh <imntreal@fedoraproject.org>
Date: Apr 10 2010 15:57:18 +0000
Subject: Removed font symlinks


---

diff --git a/import.log b/import.log
index e4f1067..bf27aa0 100644
--- a/import.log
+++ b/import.log
@@ -7,3 +7,4 @@ libprojectM-1_2_0-9_fc10:HEAD:libprojectM-1.2.0-9.fc10.src.rpm:1235610375
 libprojectM-2_0_1-1_fc12:HEAD:libprojectM-2.0.1-1.fc12.src.rpm:1260820819
 libprojectM-2_0_1-2_fc12:HEAD:libprojectM-2.0.1-2.fc12.src.rpm:1263682561
 libprojectM-2_0_1-3_fc12:HEAD:libprojectM-2.0.1-3.fc12.src.rpm:1265639585
+libprojectM-2_0_1-4_fc12:F-13:libprojectM-2.0.1-4.fc12.src.rpm:1270915017
diff --git a/libprojectM-fonts.patch b/libprojectM-fonts.patch
index e3f85b8..1ead031 100644
--- a/libprojectM-fonts.patch
+++ b/libprojectM-fonts.patch
@@ -9,3 +9,14 @@
  INSTALL(FILES ${Renderer_SOURCE_DIR}/projectM.cg ${Renderer_SOURCE_DIR}/blur.cg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/shaders)
  INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/libprojectM.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig)
  INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/config.inp DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM)
+--- libprojectM-2.0.1-orig/config.inp.in	2010-01-16 17:23:11.000000000 -0500
++++ libprojectM-2.0.1/config.inp.in	2010-04-05 14:53:21.000000000 -0400
+@@ -17,6 +17,6 @@
+ Aspect Correction = true	# Custom Shape Aspect Correction
+ 
+ Preset Path = @CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@/presets # preset location
+-Title Font = @CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@/fonts/Vera.ttf
+-Menu Font = @CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@/fonts/VeraMono.ttf
++Title Font = @CMAKE_INSTALL_PREFIX@/share/fonts/bitstream-vera/Vera.ttf
++Menu Font = @CMAKE_INSTALL_PREFIX@/share/fonts/bitstream-vera/VeraMono.ttf
+  
diff --git a/libprojectM.spec b/libprojectM.spec
index 837b9dc..72fe749 100644
--- a/libprojectM.spec
+++ b/libprojectM.spec
@@ -1,6 +1,6 @@
 Name:		libprojectM
 Version:	2.0.1
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	The libraries for the projectM music visualization plugin
 Group:		Applications/Multimedia
 License:	LGPLv2+
@@ -15,7 +15,7 @@ Patch2:		libprojectM-USE_THREADS.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	ftgl-devel, cmake, glew-devel
-Requires:	dejavu-sans-mono-fonts, dejavu-sans-fonts
+Requires:	bitstream-vera-sans-mono-fonts, bitstream-vera-sans-fonts
 
 %description
 projectM is an awesome music visualizer. There is nothing better in the world
@@ -50,8 +50,6 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 mkdir $RPM_BUILD_ROOT/%{_datadir}/projectM/fonts
-ln -s ../../fonts/dejavu/DejaVuSans.ttf $RPM_BUILD_ROOT/%{_datadir}/projectM/fonts/Vera.ttf
-ln -s ../../fonts/dejavu/DejaVuSansMono.ttf $RPM_BUILD_ROOT/%{_datadir}/projectM/fonts/VeraMono.ttf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -74,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Apr 05 2010 Jameson Pugh (imntreal@gmail.com) - 2.0.1-4
+- Got rid of font symlinks
+
 * Mon Feb 08 2010 Jameson Pugh (imntreal@gmail.com) - 2.0.1-3
 - Patch to remove the USE_THREADS option pending an update from upstream