diff --git a/gfs-jackson-fonts-fontconfig.conf b/gfs-jackson-fonts-fontconfig.conf index 342af74..63e4844 100644 --- a/gfs-jackson-fonts-fontconfig.conf +++ b/gfs-jackson-fonts-fontconfig.conf @@ -2,15 +2,15 @@ - GFS Jackson - - fantasy - - - fantasy GFS Jackson + + GFS Jackson + + fantasy + + diff --git a/gfs-jackson-fonts.spec b/gfs-jackson-fonts.spec index 06f470e..75431e5 100644 --- a/gfs-jackson-fonts.spec +++ b/gfs-jackson-fonts.spec @@ -1,22 +1,23 @@ -%define fontname gfs-jackson -%define fontdir %{_datadir}/fonts/%{fontname} -%define fontconfdir %{_sysconfdir}/fonts/conf.d +%define fontname gfs-jackson +%define fontconf 61-%{fontname}.conf %define archivename GFS_JACKSON Name: %{fontname}-fonts Version: 20080303 -Release: 1%{?dist} +Release: 3%{?dist} Summary: GFS Jackson majuscule Greek font -Group: User Interface/X -License: OFL -URL: http://www.greekfontsociety.gr/pages/en_typefaces_majuscules.html -Source0: http://www.greekfontsociety.gr/%{archivename}.zip -Source1: %{name}-fontconfig.conf - +Group: User Interface/X +License: OFL +URL: http://www.greekfontsociety.gr/pages/en_typefaces_majuscules.html +Source0: http://www.greekfontsociety.gr/%{archivename}.zip +Source1: %{name}-fontconfig.conf BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -BuildArch: noarch + +BuildArch: noarch +BuildRequires: fontpackages-devel +Requires: fontpackages-filesystem %description As it is known, the Greek alphabet was used in majuscule form for over a @@ -55,46 +56,42 @@ done %build -# Nothing there %install rm -fr %{buildroot} -install -m 0755 -d %{buildroot}%{fontdir} -install -m 0644 -p *.otf %{buildroot}%{fontdir} +install -m 0755 -d %{buildroot}%{_fontdir} +install -m 0644 -p *.otf %{buildroot}%{_fontdir} -install -m 0755 -d %{buildroot}%{fontconfdir} -install -m 0644 -p %{SOURCE1} %{buildroot}%{fontconfdir}/61-%{fontname}.conf +install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \ + %{buildroot}%{_fontconfig_confdir} + +install -m 0644 -p %{SOURCE1} \ + %{buildroot}%{_fontconfig_templatedir}/%{fontconf} +ln -s %{_fontconfig_templatedir}/%{fontconf} \ + %{buildroot}%{_fontconfig_confdir}/%{fontconf} %clean rm -fr %{buildroot} -%post -if [ -x %{_bindir}/fc-cache ] ; then - %{_bindir}/fc-cache %{fontdir} || : -fi - +%_font_pkg -f %{fontconf} *.otf -%postun -if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then - %{_bindir}/fc-cache %{fontdir} || : -fi - - -%files -%defattr(0644,root,root,0755) %doc *.txt +%dir %{_fontdir} -%config(noreplace) %{fontconfdir}/61-%{fontname}.conf -%dir %{fontdir}/ -%{fontdir}/*.otf +%changelog +* Sun Nov 23 2008 +- 20080303-3 +ᛤ ‘rpm-fonts’ renamed to “fontpackages” +* Fri Nov 14 2008 +- 20080303-2 +▤ Rebuild using new « rpm-fonts » -%changelog * Sun Jul 06 2008 Nicolas Mailhot - 20080303-1 Π initial packaging diff --git a/import.log b/import.log index 9318b9e..c4933d8 100644 --- a/import.log +++ b/import.log @@ -1 +1,2 @@ gfs-jackson-fonts-20080303-1_fc10:HEAD:gfs-jackson-fonts-20080303-1.fc10.src.rpm:1216483310 +gfs-jackson-fonts-20080303-3_fc11:HEAD:gfs-jackson-fonts-20080303-3.fc11.src.rpm:1229543149