diff --git a/.cvsignore b/.cvsignore index a190618..78a5d61 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -fontpackages-1.28.tar.xz +fontpackages-1.35.tar.xz diff --git a/fontpackages.spec b/fontpackages.spec index b567cac..6166129 100644 --- a/fontpackages.spec +++ b/fontpackages.spec @@ -3,7 +3,7 @@ %global rpmmacrodir %{_sysconfdir}/rpm/ Name: fontpackages -Version: 1.28 +Version: 1.35 Release: 1%{?dist} Summary: Common directory and macro definitions used by font packages @@ -36,19 +36,33 @@ including the correct permissions for the directories. Summary: Templates and macros used to create font packages Requires: rpmdevtools, %{name}-filesystem = %{version}-%{release} -Requires: fontconfig, rpmlint +Requires: fontconfig %description devel This package contains spec templates, rpm macros and other materials used to create font packages. +%package tools +Summary: Tools used to check fonts and font packages + +Requires: fontconfig, fontforge, mutt, make +Requires: rpmlint, yum-utils, fedora-packager + +%description tools +This package contains tools used to check fonts and font packages + + %prep %setup -q %build +for file in bin/repo-font-audit bin/compare-repo-font-audit ; do +sed -i "s|^DATADIR\([[:space:]]*\)\?=\(.*\)$|DATADIR=%{_datadir}/%{name}|g" \ + $file +done %install rm -fr %{buildroot} @@ -67,11 +81,18 @@ 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 \ + private/test-info %{buildroot}/%{_datadir}/%{name} +install -m 0755 -p bin/* %{buildroot}%{_bindir} cat < %{name}-%{version}.files %defattr(0644,root,root,0755) @@ -88,6 +109,7 @@ rm -fr %{buildroot} %files filesystem -f %{name}-%{version}.files %defattr(0644,root,root,0755) %dir %{_datadir}/fontconfig + %files devel %defattr(0644,root,root,0755) %doc license.txt readme.txt @@ -96,10 +118,54 @@ rm -fr %{buildroot} %dir %{ftcgtemplatedir} %{ftcgtemplatedir}/*conf %{ftcgtemplatedir}/*txt -%attr(0755,root,root) %{_bindir}/* +%files tools +%defattr(0644,root,root,0755) +%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 +%{_datadir}/%{name}/test-info +%{_bindir}/* %changelog +* Mon Nov 23 2009 Nicolas Mailhot +- 1.35-1 + +* Sun Nov 22 2009 Nicolas Mailhot +- 1.34-1 +— compare-repo-font-audit: make output more comprehensive + +* Sat Nov 21 2009 Nicolas Mailhot +- 1.33-1 +— repo-font-audit: add ancilliary script to compare the results of two + different runs +- 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 +- 1.31-2 +— add yum-utils to deps +- 1.31-1 +— Rework repo-font-audit messages based on packager feedback + +* Thu Oct 29 2009 Nicolas Mailhot +- 1.30-1 +— Bugfix release + +* Tue Oct 27 2009 Nicolas Mailhot +- 1.29-1 +— Split out tools as repo-font-audit requirements grow + * Mon Oct 19 2009 Nicolas Mailhot - 1.28-1 — Rework repo-font-audit to also generate individual packager nagmails diff --git a/import.log b/import.log index 67ae8e4..be6d0ac 100644 --- a/import.log +++ b/import.log @@ -11,3 +11,4 @@ fontpackages-1_19-2_fc11:HEAD:fontpackages-1.19-2.fc11.src.rpm:1234813732 fontpackages-1_20-1_fc11:HEAD:fontpackages-1.20-1.fc11.src.rpm:1234998636 fontpackages-1_20-1_fc11:HEAD:fontpackages-1.20-1.fc11.src.rpm:1235377920 fontpackages-1_28-1_fc13:F-11:fontpackages-1.28-1.fc13.src.rpm:1255987473 +fontpackages-1_35-1_fc13:F-11:fontpackages-1.35-1.fc13.src.rpm:1259011916 diff --git a/sources b/sources index ef342a2..8103a4b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0702fe5a2cc4d16df807003fe0c40ae2 fontpackages-1.28.tar.xz +889ebe16ea65deb3e5ce14612a2f94ec fontpackages-1.35.tar.xz