rpms/gfs-baskerville-fonts/devel gfs-baskerville-fonts-fontconfig.conf, NONE, 1.1 import.log, NONE, 1.1 gfs-baskerville-fonts.spec, 1.6, 1.7

[nim]

Author: nim

Update of /cvs/extras/rpms/gfs-baskerville-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8595/devel

Modified Files:
    gfs-baskerville-fonts.spec 
Added Files:
    gfs-baskerville-fonts-fontconfig.conf import.log 
Log Message:
⌖ Fedora 10 alpha general package cleanup

--- NEW FILE gfs-baskerville-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>GFS Baskerville</family>
    <default>
      <family>fantasy</family>
    </default>
  </alias>
  <alias>
    <family>fantasy</family>
    <prefer>
      <family>GFS Baskerville</family>
    </prefer>
  </alias>
</fontconfig>

--- NEW FILE import.log ---
gfs-baskerville-fonts-20070327-8_fc10:HEAD:gfs-baskerville-fonts-20070327-8.fc10.src.rpm:1215808097

Index: gfs-baskerville-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/gfs-baskerville-fonts/devel/gfs-baskerville-fonts.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gfs-baskerville-fonts.spec	30 Apr 2008 21:50:47 -0000	1.6
+++ gfs-baskerville-fonts.spec	11 Jul 2008 20:28:42 -0000	1.7
@@ -1,17 +1,19 @@
-%define fontname gfs-baskerville
-%define fontdir  %{_datadir}/fonts/%{fontname}
+%define fontname    gfs-baskerville
+%define fontdir     %{_datadir}/fonts/%{fontname}
+%define fontconfdir %{_sysconfdir}/fonts/conf.d

%define archivename GFS_BASKERVILLE_OT

Name:    %{fontname}-fonts
 Version: 20070327
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary: GFS Baskerville Greek font

Group:   User Interface/X
 License: OFL
 URL:     http://www.greekfontsociety.gr/pages/en_typefaces18th.html
 Source0: http://www.greekfontsociety.gr/%%7Barchivename%7D.zip
+Source1: %{name}-fontconfig.conf

BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch: noarch
@@ -62,22 +64,23 @@
 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
+

%clean
 rm -fr %{buildroot}

%post
-if [ -x %{_bindir}/fc-cache ]; then
-  %{_bindir}/fc-cache %{fontdir} || :
+if [ -x %{_bindir}/fc-cache ] ; then
+    %{_bindir}/fc-cache %{fontdir} || :
 fi

%postun
-if [ "$1" = "0" ]; then
-  if [ -x %{_bindir}/fc-cache ]; then
+if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then
     %{_bindir}/fc-cache %{fontdir} || :
-  fi
 fi

@@ -85,11 +88,17 @@
 %defattr(0644,root,root,0755)
 %doc *.txt *.pdf

-%dir %{fontdir}
+%config(noreplace) %{fontconfdir}/61-%{fontname}.conf
+
+%dir %{fontdir}/
 %{fontdir}/*.otf

%changelog
+* Fri Jul 11 2008 <nicolas.mailhot at laposte.net>
+- 20070415-8
+⌖ Fedora 10 alpha general package cleanup
+
 * Wed Apr 30 2008 Nicolas Mailhot <nicolas.mailhot at laposte.net>
 - 20070327-7
 ⥁ Yet another prep fix®