From 51f8c2a5b1c63216b7e62dbf6095fbd9d7a405de Mon Sep 17 00:00:00 2001
From: Nicolas Mailhot <nim@fedoraproject.org>
Date: Oct 17 2009 18:41:10 +0000
Subject: repo-font-audit: fixes for bitmap fonts


---

diff --git a/bin/repo-font-audit b/bin/repo-font-audit
index 68f8f9c..ed8da82 100755
--- a/bin/repo-font-audit
+++ b/bin/repo-font-audit
@@ -252,7 +252,8 @@ echo "Searching for packages that include files with common font extensions…"
 repoquery --repofrompath=$REPOID,$REPOURL --repoid=$REPOID \
           --qf "%{sourcerpm}|%{name}|%{epoch}:%{version}-%{release}|%{arch}|%{packagesize}" \
           -f '*.ttf' -f '*.otf' -f '*.ttc' \
-          -f '*.pfb' -f '*.pfa' -f '*.pcf.gz' --quiet \
+          -f '*.pfb' -f '*.pfa' \
+          -f '*.pcf.gz' -f '*.pcf' -f '*.bdf' --quiet \
           | sed 's=^\([^|]\+\?\)\-\([^-|]\+\?\)\-\([^-|]\+\?\)|=\1|=g' \
           | sort | uniq > "$PWFL"
 
@@ -288,9 +289,9 @@ cat "../$FPL" "../$PWFL" | awk -F '|' '{ print $2 "-" $3 "." $4 }' | sort | uniq
     | grep -v "^./etc/fonts/conf.d/" \
     | grep -v "^./usr/share/doc/" \
     | grep -v "^./etc/X11/fontpath.d/" \
-    | grep -viE '\.((ttf)|(ttc)|(otf)|(pfa)|(pfb)|(pcf)|(pcf\.gz))$' |wc -l)
+    | grep -viE '\.((ttf)|(ttc)|(otf)|(pfa)|(pfb)|(bdf)|(pcf)|(pcf\.gz))$' |wc -l)
   cat "$rpm.lst" \
-    | grep -iE '\.((ttf)|(ttc)|(otf)|(pfa)|(pfb)|(pcf)|(pcf\.gz))$' \
+    | grep -iE '\.((ttf)|(ttc)|(otf)|(pfa)|(pfb)|(bdf)|(pcf)|(pcf\.gz))$' \
     > "$rpm.fonts.lst"
   cpio -idm --quiet -E "$rpm.fonts.lst" < "$rpm.cpio"
   echo -ne "\b● "
@@ -313,6 +314,9 @@ cat "../$FPL" "../$PWFL" | awk -F '|' '{ print $2 "-" $3 "." $4 }' | sort | uniq
       "X11 Portable Compiled Font data")
         echo -n "b"
         ;;
+      "X11 BDF font text")
+        echo -n "B"
+        ;;
       # PostScript files are a mess
       "PostScript Type 1 font text")
         echo -n "P"
diff --git a/changelog.txt b/changelog.txt
index 44a825c..25f3051 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,4 +1,5 @@
 Git
+     - repo-font-audit: fixes for bitmap fonts
      - repo-font-audit: make test_score() smarter
 1.27
      - do not forget to rewrite fullname in the remapping and merging