Ralf S. Engelschall 17 роки тому
батько
коміт
9e9d7942c2
3 змінених файлів з 22 додано та 2 видалено
  1. 1 0
      fonts-free/fonts-free.conf
  2. 16 2
      fonts-free/fonts-free.spec
  3. 5 0
      fonts-free/fonts-free.txt

+ 1 - 0
fonts-free/fonts-free.conf

@@ -13,6 +13,7 @@
     <dir>@l_prefix@/share/fonts-free/Liberation</dir>
     <dir>@l_prefix@/share/fonts-free/Lido</dir>
     <dir>@l_prefix@/share/fonts-free/LinLibertine</dir>
+    <dir>@l_prefix@/share/fonts-free/Luxi</dir>
     <dir>@l_prefix@/share/fonts-free/Tuffy</dir>
     <dir>@l_prefix@/share/fonts-free/URW</dir>
     <dir>@l_prefix@/share/fonts-free/Union</dir>

+ 16 - 2
fonts-free/fonts-free.spec

@@ -40,6 +40,7 @@
 %define       V_asanamath  20071214
 %define       V_unifont    5.1.20080820
 %define       V_tuffy      20071106
+%define       V_luxi       1.0.0
 
 #   package information
 Name:         fonts-free
@@ -73,8 +74,9 @@ Source14:     http://switch.dl.sourceforge.net/linuxlibertine/LinLibertineFont-%
 Source15:     ftp://ftp.openpkg.org/sources/CPY/fonts-free/asanamath-%{V_asanamath}.otf
 Source16:     http://unifoundry.com/unifont-%{V_unifont}.ttf.gz
 Source17:     http://tulrich.com/fonts/tuffy-%{V_tuffy}.tar.gz
-Source18:     fonts-free.txt
-Source19:     fonts-free.conf
+Source18:     http://xorg.freedesktop.org/releases/individual/font/font-bh-ttf-%{V_luxi}.tar.bz2
+Source19:     fonts-free.txt
+Source20:     fonts-free.conf
 
 #   build information
 Prefix:       %{l_prefix}
@@ -183,6 +185,11 @@ AutoReqProv:  no
         url       = http://tulrich.com/fonts/
         regex     = tuffy-(__VER__)\.ttf\.gz
     }
+    prog fonts-free:luxi = {
+        version   = %{V_luxi}
+        url       = http://xorg.freedesktop.org/releases/individual/font/
+        regex     = font-bh-ttf-(__VER__)\.ttf\.bz2
+    }
 
 %prep
     %setup -q -T -c
@@ -202,6 +209,7 @@ AutoReqProv:  no
     %setup -q -T -D -a 13
     %setup -q -T -D -a 14
     %setup -q -T -D -a 17
+    %setup -q -T -D -a 18
 
 %build
 
@@ -327,6 +335,12 @@ AutoReqProv:  no
     cp  tuffy-*/*.otf \
         $RPM_BUILD_ROOT%{l_prefix}/share/fonts-free/Tuffy/
 
+    #   install font: Luxi
+    %{l_shtool} mkdir -f -p -m 755 \
+        $RPM_BUILD_ROOT%{l_prefix}/share/fonts-free/Luxi
+    cp  font-bh-ttf-*/*.ttf \
+        $RPM_BUILD_ROOT%{l_prefix}/share/fonts-free/Luxi/
+
     #   hook into fontconfig(1)
     %{l_shtool} mkdir -f -p -m 755 \
         $RPM_BUILD_ROOT%{l_prefix}/etc/fontconfig/conf.avail \

+ 5 - 0
fonts-free/fonts-free.txt

@@ -89,3 +89,8 @@
     Publisher: Public Domain
     Author:    Thatcher Ulrich
 
+  o Font:      Luxi
+    Homepage:  http://en.wikipedia.org/wiki/Luxi_(fonts)
+    Publisher: X.org
+    Author:    Bigelow & Holmes Inc.
+