"add standard Junius fonts, too"

fonts-free/fonts-free.spec

@@ -55,6 +55,7 @@
 %define       V_graublau      20091207
 %define       V_mplusoutline  TESTFLIGHT-029
 %define       V_junicode      0-6-17
+%define       V_junius        20100331
 
 #   package information
 Name:         fonts-free
@@ -104,8 +105,10 @@ Source30:     http://download.openpkg.org/components/versioned/fonts-free/Graubl
 Source31:     http://switch.dl.sourceforge.net/dejavu/dejavu-lgc-fonts-ttf-%{V_dejavu}.tar.bz2
 Source32:     http://iij.dl.sourceforge.jp/mplus-fonts/6650/mplus-%{V_mplusoutline}.tar.gz
 Source33:     http://switch.dl.sourceforge.net/junicode/junicode-%{V_junicode}.zip
-Source34:     fonts-free.txt
-Source35:     fonts-free.conf
+Source34:     http://download.openpkg.org/components/versioned/fonts-free/juniusmodern-%{V_junius}.zip
+Source35:     http://download.openpkg.org/components/versioned/fonts-free/juniusstandard-%{V_junius}.zip
+Source36:     fonts-free.txt
+Source37:     fonts-free.conf
 
 #   build information
 BuildPreReq:  OpenPKG, openpkg >= 20100101, infozip, cabextract, xz
@@ -266,6 +269,11 @@ PreReq:       OpenPKG, openpkg >= 20100101, fontconfig
         url       = http://sourceforge.net/projects/junicode/files/
         regex     = junicode-(__VER__)\.zip
     }
+    prog fonts-free:junius = {
+        version   = %{V_junius}
+        url       = http://download.openpkg.org/components/versioned/fonts-free/
+        regex     = juniusstandard-(__VER__)\.zip
+    }
 
 %prep
     (
@@ -301,6 +309,8 @@ PreReq:       OpenPKG, openpkg >= 20100101, fontconfig
     %setup -q -T -D -a 31
     %setup -q -T -D -a 32
     %setup -q -T -D -a 33
+    %setup -q -T -D -a 34
+    %setup -q -T -D -a 35
 
 %build
 
@@ -496,11 +506,15 @@ PreReq:       OpenPKG, openpkg >= 20100101, fontconfig
     cp mplus-*/*.ttf \
         $RPM_BUILD_ROOT%{l_prefix}/share/fonts-free/M+Outline/
 
-    #   install font: M+ Outline
+    #   install font: Junius
     %{l_shtool} mkdir -f -p -m 755 \
-        $RPM_BUILD_ROOT%{l_prefix}/share/fonts-free/JUnicode
+        $RPM_BUILD_ROOT%{l_prefix}/share/fonts-free/Junius
+    cp JuniusStandard/* \
+        $RPM_BUILD_ROOT%{l_prefix}/share/fonts-free/Junius/
+    cp JuniusModern/* \
+        $RPM_BUILD_ROOT%{l_prefix}/share/fonts-free/Junius/
     cp junicode/fonts/* \
-        $RPM_BUILD_ROOT%{l_prefix}/share/fonts-free/JUnicode/
+        $RPM_BUILD_ROOT%{l_prefix}/share/fonts-free/Junius/
 
     #   hook into fontconfig(1)
     %{l_shtool} mkdir -f -p -m 755 \

fonts-free/fonts-free.txt

@@ -149,7 +149,7 @@
     Publisher: Coji Morishita
     Author:    Coji Morishita
 
-  o Font:      Junicode (Junius-Unicode)
+  o Font:      Junius & Junius-Unicode
     Homepage:  http://junicode.sourceforge.net/
     Publisher: Peter S. Baker et al.
     Author:    Peter S. Baker et al.