rpms/tvtime/devel tvtime-1.0.2-fonts.patch, NONE, 1.1 tvtime.spec, 1.35, 1.36

[Tomas Smetana]

Author: tsmetana

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

Modified Files:
	tvtime.spec 
Added Files:
	tvtime-1.0.2-fonts.patch 
Log Message:
* Mon Mar 02 2009 Tomas Smetana <tsmetana at redhat.com> 1.0.2-4
- fix #477473 - drop fonts, depend on liberation-fonts


tvtime-1.0.2-fonts.patch:

--- NEW FILE tvtime-1.0.2-fonts.patch ---
diff -up tvtime-1.0.2/src/tvtimeosd.c.fonts tvtime-1.0.2/src/tvtimeosd.c
--- tvtime-1.0.2/src/tvtimeosd.c.fonts	2009-03-02 14:08:30.000000000 +0100
+++ tvtime-1.0.2/src/tvtimeosd.c	2009-03-02 14:09:20.000000000 +0100
@@ -206,7 +206,7 @@ tvtime_osd_t *tvtime_osd_new( int width,
     memset( osd->network_call, 0, sizeof( osd->network_call ) );
     memset( osd->show_info, 0, sizeof( osd->show_info ) );
 
-    fontfile = "tvtimeSansBold.ttf";
+    fontfile = "LiberationSans-Bold.ttf";
 
     osd->databar = osd_rect_new();
     if( !osd->databar ) {
diff -up tvtime-1.0.2/src/vbiscreen.c.fonts tvtime-1.0.2/src/vbiscreen.c
--- tvtime-1.0.2/src/vbiscreen.c.fonts	2009-03-02 14:08:40.000000000 +0100
+++ tvtime-1.0.2/src/vbiscreen.c	2009-03-02 14:09:52.000000000 +0100
@@ -99,7 +99,7 @@ vbiscreen_t *vbiscreen_new( int video_wi
     vs->bg_cr = 128;
     vs->rows = ROWS;
     vs->cols = COLS;
-    vs->fontfile = "FreeMonoBold.ttf";
+    vs->fontfile = "LiberationMono-Bold.ttf";
     vs->fontsize = fontsize;
     vs->width = video_width;
     vs->height = video_height;


Index: tvtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tvtime/devel/tvtime.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- tvtime.spec	25 Feb 2009 22:19:10 -0000	1.35
+++ tvtime.spec	2 Mar 2009 13:25:00 -0000	1.36
@@ -1,7 +1,7 @@
 Summary: A high quality TV viewer
 Name: tvtime
 Version: 1.0.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Applications/Multimedia
 URL: http://tvtime.sourceforge.net
@@ -10,10 +10,12 @@
 Patch1: tvtime-1.0.1-gcc4.1.patch
 Patch2: tvtime-1.0.1-header.patch
 Patch3: tvtime-1.0.1-fsbadval.patch
+Patch4: tvtime-1.0.2-fonts.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: gtk2 >= 2.6
+Requires: liberation-fonts
 Requires(post): desktop-file-utils
 Requires(post): hicolor-icon-theme
 Requires(postun): desktop-file-utils
@@ -48,6 +50,7 @@
 %patch1 -p1 -b .gcc
 %patch2 -p1 -b .header
 %patch3 -p1 -b .fsbadval
+%patch4 -p1 -b .fonts
 
 for i in docs/man/de/*.?; do
 	iconv -f iso-8859-1 -t utf-8 < "$i" > "${i}_"
@@ -57,12 +60,16 @@
 %build
 %configure --disable-dependency-tracking --disable-rpath
 
-make CXXFLAGS="$RPM_OPT_FLAGS" CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
+make CXXFLAGS="$RPM_OPT_FLAGS" \
+	CFLAGS="$RPM_OPT_FLAGS -DFONTDIR='\"/usr/share/fonts/liberation/\"'" \
+	%{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
 
 %makeinstall
+# remove fonts
+rm -f %{buildroot}%{_datadir}/tvtime/*.ttf
 
 %find_lang %{name}
 
@@ -102,6 +109,9 @@
 %{_bindir}/tvtime
 
 %changelog
+* Mon Mar 02 2009 Tomas Smetana <tsmetana at redhat.com> 1.0.2-4
+- fix #477473 - drop fonts, depend on liberation-fonts
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild