rpms/edrip-fonts/devel .cvsignore, 1.8, 1.9 edrip-fonts-fontconfig.conf, 1.3, 1.4 edrip-fonts.spec, 1.12, 1.13 import.log, 1.4, 1.5 sources, 1.8, 1.9

[Nicolas Mailhot]

Author: nim

Update of /cvs/extras/rpms/edrip-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14020/devel

Modified Files:
	.cvsignore edrip-fonts-fontconfig.conf edrip-fonts.spec 
	import.log sources 
Log Message:
update for new fonts guidelines


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/edrip-fonts/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	1 Sep 2008 15:35:26 -0000	1.8
+++ .cvsignore	17 Dec 2008 19:23:44 -0000	1.9
@@ -1 +1 @@
-edrip-src-20080826.tar.bz2
+edrip-src-20081007.tar.bz2


Index: edrip-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/edrip-fonts/devel/edrip-fonts-fontconfig.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- edrip-fonts-fontconfig.conf	4 Jun 2008 17:34:10 -0000	1.3
+++ edrip-fonts-fontconfig.conf	17 Dec 2008 19:23:44 -0000	1.4
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
 <fontconfig>
-  <alias binding="same">
-    <family>Teams</family>
-    <accept>
+  <alias>
+    <family>fantasy</family>
+    <prefer>
       <family>Edrip</family>
-    </accept>
+    </prefer>
   </alias>
   <alias>
     <family>Edrip</family>
@@ -13,10 +13,10 @@
       <family>fantasy</family>
     </default>
   </alias>
-  <alias>
-    <family>fantasy</family>
-    <prefer>
+  <alias binding="same">
+    <family>Teams</family>
+    <accept>
       <family>Edrip</family>
-    </prefer>
+    </accept>
   </alias>
 </fontconfig>


Index: edrip-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/edrip-fonts/devel/edrip-fonts.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- edrip-fonts.spec	3 Sep 2008 21:10:04 -0000	1.12
+++ edrip-fonts.spec	17 Dec 2008 19:23:44 -0000	1.13
@@ -1,27 +1,26 @@
-%define fontname    edrip
-%define fontdir     %{_datadir}/fonts/%{fontname}
-%define fontconfdir %{_sysconfdir}/fonts/conf.d
+%define fontname edrip
+%define fontconf 61-%{fontname}.conf
 
 %define archivename %{fontname}-src-%{version}
 
 Name:    %{fontname}-fonts
-Version: 20080826
+Version: 20081007
 Release: 2%{?dist}
 Summary: Edrip decorative font
 
-Group:   User Interface/X
-License: OFL
-URL:     ftp://ftp.dvo.ru/pub/Font/%{fontname}/
-Source0: %{url}%{archivename}.tar.bz2
-Source1: %{name}-fontconfig.conf
-
-Patch0: edrip-fonts-license.patch
-
+Group:     User Interface/X
+License:   OFL
+URL:       ftp://ftp.dvo.ru/pub/Font/%{fontname}/
+Source0:   %{url}%{archivename}.tar.bz2
+Source1:   %{name}-fontconfig.conf
+Patch0:    edrip-fonts-license.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildArch: noarch
 
-BuildRequires: xgridfit >= 1.9
-BuildRequires: fontforge >= 20080429
+BuildArch:     noarch
+BuildRequires: fontpackages-devel
+BuildRequires: xgridfit
+BuildRequires: fontforge
+Requires:      fontpackages-filesystem
 
 %description
 Edrip font is a contrast sans-serif font. It is based on the Teams font
@@ -40,41 +39,38 @@
 %install
 rm -fr %{buildroot}
 
-install -m 0755 -d %{buildroot}%{fontdir}
-install -m 0644 -p Edrip-*.ttf %{buildroot}%{fontdir}
+install -m 0755 -d %{buildroot}%{_fontdir}
+install -m 0644 -p *.ttf %{buildroot}%{_fontdir}
 
-install -m 0755 -d %{buildroot}%{fontconfdir}
-# Would be higher prio if the coverage was more complete
-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} *.ttf
 
-%postun
-if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then
-    %{_bindir}/fc-cache %{fontdir} || :
-fi
-
-
-%files
-%defattr(0644,root,root,0755)
 %doc *.txt README
+%dir %{_fontdir}
 
-%config(noreplace) %{fontconfdir}/61-%{fontname}.conf
 
-%dir %{fontdir}/
-%{fontdir}/Edrip-*.ttf
+%changelog
 
+* Sun Nov 23 2008 <nicolas.mailhot at laposte.net>
+- 20081007-2
+ᛤ ‘rpm-fonts’ renamed to “fontpackages”
+
+* Fri Nov 14 2008 <nicolas.mailhot at laposte.net>
+- 20081007-1
+▤ Rebuild using new « rpm-fonts »
 
-%changelog
 * Wed Sep 3 2008 <nicolas.mailhot at laposte.net>
 - 20080826-2
 âš™ Rebuild with pre-F10-freeze fontforge


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/edrip-fonts/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	3 Sep 2008 21:10:04 -0000	1.4
+++ import.log	17 Dec 2008 19:23:44 -0000	1.5
@@ -2,3 +2,4 @@
 edrip-fonts-20080717-1_fc10_nim:HEAD:edrip-fonts-20080717-1.fc10.nim.src.rpm:1216368564
 edrip-fonts-20080826-1_fc10_nim:HEAD:edrip-fonts-20080826-1.fc10.nim.src.rpm:1220283093
 edrip-fonts-20080826-2_fc10:HEAD:edrip-fonts-20080826-2.fc10.src.rpm:1220476184
+edrip-fonts-20081007-2_fc11:HEAD:edrip-fonts-20081007-2.fc11.src.rpm:1229541799


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/edrip-fonts/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	1 Sep 2008 15:35:26 -0000	1.8
+++ sources	17 Dec 2008 19:23:44 -0000	1.9
@@ -1 +1 @@
-c085cb7a1d9b51f58e373caeeace158c  edrip-src-20080826.tar.bz2
+b745af94b865df2b0c20fe72ff58b568  edrip-src-20081007.tar.bz2