rpms/feh/devel feh-1.3.4-dejavu.patch,NONE,1.1 feh.spec,1.13,1.14

[Ignacio Vazquez-Abrams]

Author: ivazquez

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

Modified Files:
	feh.spec 
Added Files:
	feh-1.3.4-dejavu.patch 
Log Message:
Switch from included font to DejaVu Sans

feh-1.3.4-dejavu.patch:

--- NEW FILE feh-1.3.4-dejavu.patch ---
diff -up feh-1.3.4/src/feh.h.dejavu feh-1.3.4/src/feh.h
--- feh-1.3.4/src/feh.h.dejavu	2008-12-20 23:46:53.000000000 -0500
+++ feh-1.3.4/src/feh.h	2008-12-20 23:47:22.000000000 -0500
@@ -84,10 +84,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE 
 #define XY_IN_RECT(x, y, rx, ry, rw, rh) \
 (((x) >= (rx)) && ((y) >= (ry)) && ((x) < ((rx) + (rw))) && ((y) < ((ry) + (rh))))
 
-#define DEFAULT_FONT "yudit/11"
-#define DEFAULT_MENU_FONT "yudit/10"
-#define DEFAULT_FONT_BIG "yudit/12"
-#define DEFAULT_FONT_TITLE "yudit/14"
+#define DEFAULT_FONT "DejaVuSans/11"
+#define DEFAULT_MENU_FONT "DejaVuSans/10"
+#define DEFAULT_FONT_BIG "DejaVuSans/12"
+#define DEFAULT_FONT_TITLE "DejaVuSans/14"
 
 enum mode_type
 { MODE_NORMAL = 0, MODE_PAN, MODE_ZOOM, MODE_ROTATE, MODE_BLUR, MODE_NEXT };
diff -up feh-1.3.4/src/imlib.c.dejavu feh-1.3.4/src/imlib.c
--- feh-1.3.4/src/imlib.c.dejavu	2008-12-20 23:45:49.000000000 -0500
+++ feh-1.3.4/src/imlib.c	2008-12-20 23:47:31.000000000 -0500
@@ -98,6 +98,7 @@ init_x_and_imlib(void)
 
    /* Set up the font stuff */
    imlib_add_path_to_font_path(".");
+   imlib_add_path_to_font_path("/usr/share/fonts/dejavu");
    imlib_add_path_to_font_path(PREFIX "/share/feh/fonts");
    imlib_add_path_to_font_path("./ttfonts");
 


Index: feh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/feh/devel/feh.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- feh.spec	10 Apr 2008 11:52:54 -0000	1.13
+++ feh.spec	21 Dec 2008 22:14:52 -0000	1.14
@@ -3,7 +3,7 @@
 
 Name:           feh 
 Version:        1.3.4
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Fast command line image viewer using Imlib2
 Group:          Applications/Multimedia
 License:        MIT
@@ -16,9 +16,15 @@
 Patch2:         feh-1.3.4-svn-fixes.patch
 Patch3:         feh-1.3.4-man.patch
 Patch4:         feh-1.3.4-bz441527.patch
+Patch5:         feh-1.3.4-dejavu.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  giblib-devel imlib2-devel libjpeg-devel libpng-devel
 BuildRequires:  libXt-devel
+%if 0%{?fedora} > 10
+Requires:       dejavu-sans-fonts
+%else
+Requires:       dejavu-fonts
+%endif
 
 %description
 feh is a versatile and fast image viewer using imlib2, the
@@ -35,6 +41,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 
 %build
@@ -45,6 +52,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+rm $RPM_BUILD_ROOT%{_datadir}/%{name}/fonts/yudit.ttf
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 rm -rf $RPM_BUILD_ROOT/usr/doc
 
@@ -62,6 +70,9 @@
 
 
 %changelog
+* Sun Dec 21 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> 1.3.4-9
+- Switch from included font to DejaVu Sans
+
 * Thu Apr 10 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.3.4-8
 - Remove non free menubg_britney.png from sources
 - Apply various fixes from svn