From 92589c1e9c17b9d0928561a937de205131113b40 Mon Sep 17 00:00:00 2001
From: nim <nim@fedoraproject.org>
Date: Nov 21 2009 10:44:18 +0000
Subject: 1.32


---

diff --git a/.cvsignore b/.cvsignore
index b08c970..bfb90e2 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-fontpackages-1.31.tar.xz
+fontpackages-1.32.tar.xz
diff --git a/fontpackages.spec b/fontpackages.spec
index 8efb090..4657597 100644
--- a/fontpackages.spec
+++ b/fontpackages.spec
@@ -3,8 +3,8 @@
 %global rpmmacrodir     %{_sysconfdir}/rpm/
 
 Name:    fontpackages
-Version: 1.31
-Release: 2%{?dist}
+Version: 1.32
+Release: 1%{?dist}
 Summary: Common directory and macro definitions used by font packages
 
 Group:     Development/System
@@ -46,7 +46,8 @@ create font packages.
 %package tools
 Summary: Tools used to check fonts and font packages
 
-Requires: fontconfig, fontforge, mutt, rpmlint, yum-utils
+Requires: fontconfig, fontforge, mutt, make
+Requires: rpmlint, yum-utils, fedora-packager
 
 %description tools
 This package contains tools used to check fonts and font packages
@@ -58,6 +59,8 @@ This package contains tools used to check fonts and font packages
 
 %build
 
+sed -i "s|^DATADIR\([[:space:]]*\)\?=\(.*\)$|DATADIR=%{_datadir}/%{name}|g" \
+  bin/repo-font-audit
 
 %install
 rm -fr %{buildroot}
@@ -76,11 +79,17 @@ install -m 0755 -d %{buildroot}${_fontbasedir} \
                    %{buildroot}%{spectemplatedir} \
                    %{buildroot}%{rpmmacrodir} \
                    %{buildroot}%{_datadir}/fontconfig/templates \
+                   %{buildroot}/%_datadir/%{name} \
                    %{buildroot}%{_bindir}
-install -m 0644 -p spec-templates/*.spec  %{buildroot}%{spectemplatedir}
-install -m 0644 -p fontconfig-templates/* %{buildroot}%{ftcgtemplatedir}
-install -m 0644 -p rpm/macros*            %{buildroot}%{rpmmacrodir}
-install -m 0755 -p bin/*                  %{buildroot}%{_bindir}
+install -m 0644 -p spec-templates/*.spec       %{buildroot}%{spectemplatedir}
+install -m 0644 -p fontconfig-templates/*      %{buildroot}%{ftcgtemplatedir}
+install -m 0644 -p rpm/macros*                 %{buildroot}%{rpmmacrodir}
+install -m 0644 -p private/repo-font-audit.mk  %{buildroot}/%{_datadir}/%{name}
+install -m 0755 -p private/core-fonts-report \
+                   private/font-links-report \
+                   private/fonts-report \
+                   private/process-fc-query    %{buildroot}/%{_datadir}/%{name}
+install -m 0755 -p bin/*                       %{buildroot}%{_bindir}
 
 cat <<EOF > %{name}-%{version}.files
 %defattr(0644,root,root,0755)
@@ -109,10 +118,27 @@ rm -fr %{buildroot}
 
 %files tools
 %defattr(0644,root,root,0755)
-%attr(0755,root,root) %{_bindir}/*
+%doc license.txt readme.txt
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/repo-font-audit.mk
+%defattr(0755,root,root,0755)
+%{_datadir}/%{name}/core-fonts-report
+%{_datadir}/%{name}/font-links-report
+%{_datadir}/%{name}/fonts-report
+%{_datadir}/%{name}/process-fc-query
+%{_bindir}/*
 
 %changelog
-* Sat Nov 1 2009 Nicolas Mailhot <nim at fedoraproject dot org>
+* Sat Nov 21 2009 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.32-1
+— repo-font-audit: add test for core fonts direct use
+— repo-font-audit: replace font naming tests by a more comprehensive one
+  (in a separate utility)
+— repo-font-audit: add fedora packager detection
+— repo-font-audit: parallelize (at the cost of more filesystem space use)
+— repo-font-audit: misc output and reliability fixes
+
+* Sun Nov 1 2009 Nicolas Mailhot <nim at fedoraproject dot org>
 - 1.31-2
 — add yum-utils to deps
 - 1.31-1
diff --git a/import.log b/import.log
index 7d610b6..3bbd7ab 100644
--- a/import.log
+++ b/import.log
@@ -22,3 +22,4 @@ fontpackages-1_29-1_fc13:HEAD:fontpackages-1.29-1.fc13.src.rpm:1256683739
 fontpackages-1_30-1_fc13:HEAD:fontpackages-1.30-1.fc13.src.rpm:1256843017
 fontpackages-1_31-1_fc13:HEAD:fontpackages-1.31-1.fc13.src.rpm:1257103069
 fontpackages-1_31-2_fc13:HEAD:fontpackages-1.31-2.fc13.src.rpm:1257112310
+fontpackages-1_32-1_fc13:HEAD:fontpackages-1.32-1.fc13.src.rpm:1258800058
diff --git a/sources b/sources
index bae0a21..06b39b3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-080c47e9ac4becd48ccd394821a7b383  fontpackages-1.31.tar.xz
+6b783ee4a4017918e999fdddf8e12aec  fontpackages-1.32.tar.xz