rpms/ecolier-court-fonts/devel ecolier-court-fonts-lignes-fontconfig.conf, NONE, 1.1 ecolier-court-fonts-fontconfig.conf, 1.1, 1.2 ecolier-court-fonts.spec, 1.1, 1.2 import.log, 1.1, 1.2

[Nicolas Mailhot]

Author: nim

Update of /cvs/extras/rpms/ecolier-court-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13435/devel

Modified Files:
	ecolier-court-fonts-fontconfig.conf ecolier-court-fonts.spec 
	import.log 
Added Files:
	ecolier-court-fonts-lignes-fontconfig.conf 
Log Message:
update for new fonts guidelines


--- NEW FILE ecolier-court-fonts-lignes-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>fantasy</family>
    <prefer>
      <family>Ecolier_lignes_court</family>
    </prefer>
  </alias>
  <alias>
    <family>Ecolier_lignes_court</family>
    <default>
      <family>fantasy</family>
    </default>
  </alias>
</fontconfig>


Index: ecolier-court-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/ecolier-court-fonts/devel/ecolier-court-fonts-fontconfig.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ecolier-court-fonts-fontconfig.conf	19 Jul 2008 16:38:06 -0000	1.1
+++ ecolier-court-fonts-fontconfig.conf	17 Dec 2008 19:21:34 -0000	1.2
@@ -2,27 +2,15 @@
 <!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
 <fontconfig>
   <alias>
-    <family>Ecolier_court</family>
-    <default>
-      <family>cursive</family>
-    </default>
-  </alias>
-  <alias>
     <family>cursive</family>
     <prefer>
       <family>Ecolier_court</family>
     </prefer>
   </alias>
   <alias>
-    <family>Ecolier_lignes_court</family>
+    <family>Ecolier_court</family>
     <default>
-      <family>fantasy</family>
+      <family>cursive</family>
     </default>
   </alias>
-  <alias>
-    <family>fantasy</family>
-    <prefer>
-      <family>Ecolier_lignes_court</family>
-    </prefer>
-  </alias>
 </fontconfig>


Index: ecolier-court-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/ecolier-court-fonts/devel/ecolier-court-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ecolier-court-fonts.spec	19 Jul 2008 16:38:06 -0000	1.1
+++ ecolier-court-fonts.spec	17 Dec 2008 19:21:34 -0000	1.2
@@ -1,31 +1,64 @@
-%define fontname    ecolier-court
-%define fontdir     %{_datadir}/fonts/%{fontname}
-%define fontconfdir %{_sysconfdir}/fonts/conf.d
+%define fontname ecolier-court
+%define fontconf 61-%{fontname}
+
+%define common_desc\
+Écolier are a set of Latin fonts created by Jean-Marie Douteau to mimic the \
+traditional cursive writing French children are taught in school. \
+\
+He kindly released two of them under the OFL, which are redistributed in \
+this package.
+
 
 Name:    %{fontname}-fonts
 Version: 20070702
-Release: 1%{?dist}
+Release: 4%{?dist}
 Summary: Écolier court cursive fonts
 
-Group:   User Interface/X
-License: OFL
-URL:     http://perso.orange.fr/jm.douteau/page_ecolier.htm
+Group:     User Interface/X
+License:   OFL
+URL:       http://perso.orange.fr/jm.douteau/page_ecolier.htm
 # The author links to third-party licence documents not included there
-Source0: http://perso.orange.fr/jm.douteau/polices/ecl_cour.ttf
-Source1: http://perso.orange.fr/jm.douteau/polices/ec_cour.ttf
-Source2: http://perso.orange.fr/jm.douteau/polices/lisez_moi.txt
-Source3: README-Fedora.txt
-Source4: %{name}-fontconfig.conf
-
+Source0:   http://perso.orange.fr/jm.douteau/polices/ecl_cour.ttf
+Source1:   http://perso.orange.fr/jm.douteau/polices/ec_cour.ttf
+Source2:   http://perso.orange.fr/jm.douteau/polices/lisez_moi.txt
+Source3:   README-Fedora.txt
+Source4:   %{name}-fontconfig.conf
+Source5:   %{name}-lignes-fontconfig.conf
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildArch: noarch
+
+BuildArch:     noarch
+BuildRequires: fontpackages-devel
+Requires:      %{name}-common = %{version}-%{release}
 
 %description
-Écolier are a set of Latin fonts created by Jean-Marie Douteau to mimic the
-traditional cursive writing French children are taught in school.
+%common_desc
+
+%_font_pkg -f %{fontconf}-lignes.conf ecl_cour.ttf
+
+
+%package common
+Summary:  Écolier court, common files (documentation…)
+Group:    User Interface/X
+Requires: fontpackages-filesystem
+
+%description common
+%common_desc
+
+This package consists of files used by other %{name} packages.
+
 
-He kindly released two of them under the OFL, which are redistributed in this
-package.
+%package  lignes
+Summary:  Écolier lignes court fantasy font
+Group:    User Interface/X
+Requires: %{name}-common = %{version}-%{release}
+
+%description lignes
+%common_desc
+
+The « lignes » (lines) font variant includes the Seyes lining commonly used by
+schoolchildren notepads.
+
+%_font_pkg -n lignes -f %{fontconf}.conf ec_cour.ttf
 
 
 %prep
@@ -42,46 +75,48 @@
 
 
 %build
-# Nothing there
 
 
 %install
 rm -fr %{buildroot}
 
-install -m 0755 -d %{buildroot}%{fontdir}
-install -m 0644 -p %{SOURCE0} %{SOURCE1} %{buildroot}%{fontdir}
+install -m 0755 -d %{buildroot}%{_fontdir}
+install -m 0644 -p %{SOURCE0} %{SOURCE1} %{buildroot}%{_fontdir}
 
-install -m 0755 -d %{buildroot}%{fontconfdir}
-install -m 0644 -p %{SOURCE4} %{buildroot}%{fontconfdir}/61-%{fontname}.conf
+install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
+                   %{buildroot}%{_fontconfig_confdir}
 
+install -m 0644 -p %{SOURCE4} \
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}.conf
+install -m 0644 -p %{SOURCE5} \
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-lignes.conf
+
+for fontconf in %{fontconf}.conf \
+                %{fontconf}-lignes.conf ; do
+  ln -s %{_fontconfig_templatedir}/$fontconf \
+        %{buildroot}%{_fontconfig_confdir}/$fontconf
+done
 
 %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
-
-
-%files
+%files common
 %defattr(0644,root,root,0755)
 %doc *.txt
 
-%config(noreplace) %{fontconfdir}/61-%{fontname}.conf
-
-%dir %{fontdir}/
-%{fontdir}/*.ttf
+%dir %{_fontdir}
 
 
 %changelog
+* Sun Nov 23 2008 <nicolas.mailhot at laposte.net>
+- 20070702-4
+ᛤ ‘rpm-fonts’ renamed to “fontpackages”
+
+* Fri Nov 14 2008 <nicolas.mailhot at laposte.net>
+- 20070702-3
+▤ Rebuild using new « rpm-fonts »
+
 * Sat Jul 19 2008 <nicolas.mailhot at laposte.net>
 - 20070702-1
 âš± Stop waitting for upstream to answer distribution change requests


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ecolier-court-fonts/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Jul 2008 16:38:06 -0000	1.1
+++ import.log	17 Dec 2008 19:21:34 -0000	1.2
@@ -1 +1,2 @@
 ecolier-court-fonts-20070702-1_fc10:HEAD:ecolier-court-fonts-20070702-1.fc10.src.rpm:1216485467
+ecolier-court-fonts-20070702-4_fc11:HEAD:ecolier-court-fonts-20070702-4.fc11.src.rpm:1229541673