rpms/apanov-heuristica-fonts/devel apanov-heuristica-fonts.spec, 1.1, 1.2 import.log, 1.1, 1.2

[Nicolas Mailhot]

Author: nim

Update of /cvs/extras/rpms/apanov-heuristica-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11230/devel

Modified Files:
	apanov-heuristica-fonts.spec import.log 
Log Message:
update for new fonts guidelines


Index: apanov-heuristica-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/apanov-heuristica-fonts/devel/apanov-heuristica-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apanov-heuristica-fonts.spec	16 Nov 2008 21:40:37 -0000	1.1
+++ apanov-heuristica-fonts.spec	17 Dec 2008 19:13:24 -0000	1.2
@@ -1,23 +1,24 @@
-%define fontname    apanov-heuristica
-%define fontdir     %{_datadir}/fonts/%{fontname}
-%define fontconfdir %{_sysconfdir}/fonts/conf.d
+%define fontname apanov-heuristica
+%define fontconf 61-%{fontname}.conf
 
 %define archivename heuristica-src-%{version}
 
 Name:    %{fontname}-fonts
 Version: 20081109
-Release: 1%{?dist}
+Release: 3%{?dist}
 Summary: Heuristica font
 
-Group:   User Interface/X
-License: OFL
-URL:     ftp://ftp.dvo.ru/pub/Font/%{fontname}/
-Source0: %{url}%{archivename}.tar.bz2
-Source1: %{name}-fontconfig.conf
+Group:     User Interface/X
+License:   OFL
+URL:       ftp://ftp.dvo.ru/pub/Font/%{fontname}/
+Source0:   %{url}%{archivename}.tar.bz2
+Source1:   %{name}-fontconfig.conf
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:     noarch
 BuildRequires: fontforge
+BuildRequires: fontpackages-devel
+Requires:      fontpackages-filesystem
 
 %description
 Heuristica is a serif latin & cyrillic font, derived from the "Adobe Utopia®"
@@ -35,41 +36,36 @@
 %install
 rm -fr %{buildroot}
 
-install -m 0755 -d %{buildroot}%{fontdir}
-install -m 0644 -p Heuristica-*.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
-
-
-%postun
-if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then
-  %{_bindir}/fc-cache %{fontdir} || :
-fi
-
+%_font_pkg -f %{fontconf} *.otf
 
-%files
-%defattr(0644,root,root,0755)
 %doc *.txt
-
-%config(noreplace) %{fontconfdir}/61-%{fontname}.conf
-
-%dir %{fontdir}
-%{fontdir}/Heuristica-*.otf
+%dir %{_fontdir}
 
 
 %changelog
+* Sun Nov 23 2008 <nicolas.mailhot at laposte.net>
+- 20081109-3
+ᛤ ‘rpm-fonts’ renamed to “fontpackages”
+
 * Sun Nov 16 2008 <nicolas.mailhot at laposte.net>
+- 20081109-2
+▤ Rebuild using new « rpm-fonts »
 - 20081109-1
 ↝ Fedora import
 


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/apanov-heuristica-fonts/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Nov 2008 21:40:37 -0000	1.1
+++ import.log	17 Dec 2008 19:13:24 -0000	1.2
@@ -1 +1,2 @@
 apanov-heuristica-fonts-20081109-1_fc11:HEAD:apanov-heuristica-fonts-20081109-1.fc11.src.rpm:1226871596
+apanov-heuristica-fonts-20081109-3_fc11:HEAD:apanov-heuristica-fonts-20081109-3.fc11.src.rpm:1229540973