commit fonts-arabic

6 Aug 2006

Hello community,

here is the log from the commit of package fonts-arabic
checked in at Sun Aug 6 22:23:32 CEST 2006.

--------

--- fonts-arabic/fonts-arabic.changes	2006-03-01 13:28:30.000000000 +0100
+++ fonts-arabic/fonts-arabic.changes	2006-08-04 17:24:53.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Aug 04 17:24:29 CEST 2006 - mfabian@suse.de
+
+- move fonts to /usr/share/fonts/ in STABLE (paths changed
+  because of the move to Xorg X11R7).
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ fonts-arabic.spec ++++++
--- /var/tmp/diff_new_pack.Gijl65/_old	2006-08-06 22:23:23.000000000 +0200
+++ /var/tmp/diff_new_pack.Gijl65/_new	2006-08-06 22:23:23.000000000 +0200
@@ -11,7 +11,18 @@
 # norootforbuild
 
 Name:           fonts-arabic
-BuildRequires:  freetype2-devel xorg-x11 xorg-x11-devel
+%if %suse_version > 910
+BuildRequires:  xorg-x11 xorg-x11-devel
+%else
+BuildRequires:  XFree86 XFree86-devel
+%endif
+%if "%(xft-config --prefix)" == "/usr"
+%define	bitmap_fontdir  /usr/share/fonts/misc
+%define	ttf_fontdir     /usr/share/fonts/truetype
+%else
+%define	bitmap_fontdir  /usr/X11R6/lib/X11/fonts/misc
+%define	ttf_fontdir     /usr/X11R6/lib/X11/fonts/truetype
+%endif
 License:        distributable
 Group:          System/X11/Fonts
 Provides:       scalable-font-ar
@@ -19,7 +30,7 @@
 Prereq:         %suseconfig_fonts_prereq
 Provides:       locale(ar)
 Version:        0.20040113
-Release:        8
+Release:        17
 URL:            http://www.arabeyes.org/resources.php
 # public domain:
 Source0:        http://heanet.dl.sourceforge.net/sourceforge/arabeyes/ae_fonts.tar.bz2
@@ -59,7 +70,8 @@
 
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT;
-mkdir -p $RPM_BUILD_ROOT/usr/X11R6/lib/X11/fonts/{misc,truetype}
+mkdir -p $RPM_BUILD_ROOT%{bitmap_fontdir}
+mkdir -p $RPM_BUILD_ROOT%{ttf_fontdir}
 for i in *.ttf */*.ttf */*/*.ttf
 do
     # one of the kacst TrueType font files has size zero
@@ -67,13 +79,13 @@
     # (OpenOffice even coredumps when .ttf files with size zero
     # are in the path).
     if [ -s $i ] ; then
-        install -c -m 644 $i $RPM_BUILD_ROOT/usr/X11R6/lib/X11/fonts/truetype
+        install -c -m 644 $i $RPM_BUILD_ROOT%{ttf_fontdir}
     fi
 done
 for i in */*.bdf
 do
-    /usr/X11R6/bin/bdftopcf $i | gzip -9  > \
-    $RPM_BUILD_ROOT/usr/X11R6/lib/X11/fonts/misc/`basename $i .bdf`.pcf.gz
+    bdftopcf $i | gzip -9  > \
+    $RPM_BUILD_ROOT%{bitmap_fontdir}/`basename $i .bdf`.pcf.gz
 done
 
 %clean
@@ -88,10 +100,15 @@
 %files 
 %defattr(-, root,root)
 %doc License* LICENSE*
-/usr/X11R6/lib/X11/fonts/truetype/*
-/usr/X11R6/lib/X11/fonts/misc/*
+%dir %{bitmap_fontdir}/
+%dir %{bitmap_fontdir}/*
+%dir %{ttf_fontdir}/
+%dir %{ttf_fontdir}/*
 
 %changelog -n fonts-arabic
+* Fri Aug 04 2006 - mfabian@suse.de
+- move fonts to /usr/share/fonts/ in STABLE (paths changed
+  because of the move to Xorg X11R7).
 * Wed Mar 01 2006 - mfabian@suse.de
 - add "Provides: locale(ar)".
 * Wed Jan 25 2006 - mls@suse.de



++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

    

commit fonts-arabic

root＠suse.de