rpms/libprojectM/devel import.log, 1.9, 1.10 libprojectM-fonts.patch, 1.2, 1.3 libprojectM.spec, 1.10, 1.11

[Jameson Pugh]

Author: imntreal

Update of /cvs/pkgs/rpms/libprojectM/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv29123/devel

Modified Files:
	import.log libprojectM-fonts.patch libprojectM.spec 
Log Message:
Removed font symlinks



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libprojectM/devel/import.log,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- import.log	8 Feb 2010 14:33:31 -0000	1.9
+++ import.log	10 Apr 2010 15:56:35 -0000	1.10
@@ -7,3 +7,4 @@ libprojectM-1_2_0-9_fc10:HEAD:libproject
 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:HEAD:libprojectM-2.0.1-4.fc12.src.rpm:1270914969

libprojectM-fonts.patch:
 CMakeLists.txt |    2 --
 config.inp.in  |    4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

Index: libprojectM-fonts.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libprojectM/devel/libprojectM-fonts.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- libprojectM-fonts.patch	14 Dec 2009 20:00:34 -0000	1.2
+++ libprojectM-fonts.patch	10 Apr 2010 15:56:35 -0000	1.3
@@ -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
+  


Index: libprojectM.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libprojectM/devel/libprojectM.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- libprojectM.spec	8 Feb 2010 14:33:31 -0000	1.10
+++ libprojectM.spec	10 Apr 2010 15:56:35 -0000	1.11
@@ -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 at gmail.com) - 2.0.1-4
+- Got rid of font symlinks
+
 * Mon Feb 08 2010 Jameson Pugh (imntreal at gmail.com) - 2.0.1-3
 - Patch to remove the USE_THREADS option pending an update from upstream