rpms/gfs-solomos-fonts/devel gfs-solomos-fonts-fontconfig.conf, NONE, 1.1 import.log, NONE, 1.1 gfs-solomos-fonts.spec, 1.4, 1.5

[Nicolas Mailhot]

Author: nim

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

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


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


--- NEW FILE import.log ---
gfs-solomos-fonts-20071114-7_fc10:HEAD:gfs-solomos-fonts-20071114-7.fc10.src.rpm:1215809630


Index: gfs-solomos-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/gfs-solomos-fonts/devel/gfs-solomos-fonts.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gfs-solomos-fonts.spec	30 Apr 2008 22:03:49 -0000	1.4
+++ gfs-solomos-fonts.spec	11 Jul 2008 20:54:01 -0000	1.5
@@ -1,17 +1,19 @@
-%define fontname gfs-solomos
-%define fontdir  %{_datadir}/fonts/%{fontname}
+%define fontname    gfs-solomos
+%define fontdir     %{_datadir}/fonts/%{fontname}
+%define fontconfdir %{_sysconfdir}/fonts/conf.d
 
 %define archivename GFS_SOLOMOS_OT
 
 Name:    %{fontname}-fonts
 Version: 20071114
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: GFS Solomos oblique Greek font
 
 Group:   User Interface/X
 License: OFL
 URL:     http://www.greekfontsociety.gr/pages/en_typefaces19th.html
 Source0: http://www.greekfontsociety.gr/%{archivename}.zip
+Source1: %{name}-fontconfig.conf
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch: noarch
@@ -61,22 +63,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
 
 
@@ -84,11 +87,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>
+- 20071114-7
+⌖ Fedora 10 alpha general package cleanup
+
 * Wed Apr 30 2008 Nicolas Mailhot <nicolas.mailhot at laposte.net>
 - 20071114-6
 ⥁ Yet another prep fix®