rpms/gfs-didot-fonts/devel gfs-didot-fonts-fontconfig.conf, 1.2, 1.3 gfs-didot-fonts.spec, 1.5, 1.6 import.log, 1.1, 1.2

[Nicolas Mailhot]

Author: nim

Update of /cvs/extras/rpms/gfs-didot-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25748/devel

Modified Files:
	gfs-didot-fonts-fontconfig.conf gfs-didot-fonts.spec 
	import.log 
Log Message:
update for new fonts guidelines


Index: gfs-didot-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/gfs-didot-fonts/devel/gfs-didot-fonts-fontconfig.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gfs-didot-fonts-fontconfig.conf	11 Jul 2008 20:48:22 -0000	1.2
+++ gfs-didot-fonts-fontconfig.conf	17 Dec 2008 19:37:36 -0000	1.3
@@ -1,6 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
 <fontconfig>
+  <alias>
+    <family>serif</family>
+    <prefer>
+      <family>GFS Didot</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>GFS Didot</family>
+    <default>
+      <family>serif</family>
+    </default>
+  </alias>
   <alias binding="same">
     <family>Palatino</family>
     <accept>
@@ -13,16 +25,4 @@
       <family>GFS Didot</family>
     </accept>
   </alias>
-  <alias>
-    <family>GFS Didot</family>
-    <default>
-      <family>serif</family>
-    </default>
-  </alias>
-  <alias>
-    <family>serif</family>
-    <prefer>
-      <family>GFS Didot</family>
-    </prefer>
-  </alias>
 </fontconfig>


Index: gfs-didot-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/gfs-didot-fonts/devel/gfs-didot-fonts.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gfs-didot-fonts.spec	11 Jul 2008 20:48:22 -0000	1.5
+++ gfs-didot-fonts.spec	17 Dec 2008 19:37:36 -0000	1.6
@@ -1,22 +1,23 @@
-%define fontname    gfs-didot
-%define fontdir     %{_datadir}/fonts/%{fontname}
-%define fontconfdir %{_sysconfdir}/fonts/conf.d
+%define fontname gfs-didot
+%define fontconf 60-%{fontname}.conf
 
 %define archivename GFS_DIDOT_OT
 
 Name:    %{fontname}-fonts
 Version: 20070616
-Release: 7%{?dist}
+Release: 9%{?dist}
 Summary: GFS Didot fonts
 
-Group:   User Interface/X
-License: OFL
-URL:     http://www.greekfontsociety.gr/pages/en_typefaces20th.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_typefaces20th.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
 Didot’s type was the base for a new font, GFS Didot (1994) which was designed
@@ -37,46 +38,41 @@
 
 
 %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}%{_fontconfig_templatedir} \
+                   %{buildroot}%{_fontconfig_confdir}
 
-install -m 0755 -d %{buildroot}%{fontconfdir}
-install -m 0644 -p %{SOURCE1} %{buildroot}%{fontconfdir}/60-%{fontname}.conf
+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 *.pdf
-
-%config(noreplace) %{fontconfdir}/60-%{fontname}.conf
-
-%dir %{fontdir}/
-%{fontdir}/*.otf
-
+%dir %{_fontdir}
 
 %changelog
+* Sun Nov 23 2008 <nicolas.mailhot at laposte.net>
+- 20070616-9
+ᛤ ‘rpm-fonts’ renamed to “fontpackages”
+
+* Fri Nov 14 2008 <nicolas.mailhot at laposte.net>
+- 20070616-8
+▤ Rebuild using new « rpm-fonts »
+
 * Fri Jul 11 2008 <nicolas.mailhot at laposte.net>
 - 20070616-7
 ⌖ Fedora 10 alpha general package cleanup


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gfs-didot-fonts/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Jul 2008 20:48:22 -0000	1.1
+++ import.log	17 Dec 2008 19:37:36 -0000	1.2
@@ -1 +1,2 @@
 gfs-didot-fonts-20070616-7_fc10:HEAD:gfs-didot-fonts-20070616-7.fc10.src.rpm:1215809267
+gfs-didot-fonts-20070616-9_fc11:HEAD:gfs-didot-fonts-20070616-9.fc11.src.rpm:1229542633