rpms/cave9/devel cave9-mutante-fontconfig.conf, NONE, 1.1 cave9.spec, 1.2, 1.3 import.log, 1.1, 1.2

[Victor Bogado da Silva Lins]

Author: bogado

Update of /cvs/pkgs/rpms/cave9/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14494/devel

Modified Files:
	cave9.spec import.log 
Added Files:
	cave9-mutante-fontconfig.conf 
Log Message:
Separated font package. 



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


Index: cave9.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cave9/devel/cave9.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- cave9.spec	24 Feb 2009 06:38:07 -0000	1.2
+++ cave9.spec	1 Jul 2009 23:46:00 -0000	1.3
@@ -1,21 +1,43 @@
+%global fontconf 64-%{name}-mutante.conf
+
 Name:           cave9
 Version:        0.3
-Release:        4%{?dist}
+Release:        8%{?dist}
 Summary:        3d game of cave exploration
 
 Group:          Amusements/Games
-License:        LGPLv3 and CC-BY and CC-BY-SA and Public Domain
+License:        LGPLv3 and CC-BY-SA and Public Domain
 URL:            http://code.google.com/p/cave9
 Source0:        http://cave9.googlecode.com/files/cave9_src-%{version}.tgz
 Source1:        http://cave9.googlecode.com/files/cave9_data-4.tgz
 Source2:        cave9.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  SDL_image-devel, SDL_net-devel, SDL_ttf-devel, mesa-libGL-devel, desktop-file-utils
+BuildRequires:  SDL_image-devel, SDL_net-devel, SDL_ttf-devel, mesa-libGL-devel, desktop-file-utils, fontpackages-devel
+Requires:       cave9-mutante-fonts
+
 
 %description
 Cave9 is a gravity cave-exploration game.
 
+%package        mutante-fonts
+
+Summary:        Mutante font used by the hud in cave9 game
+BuildArch:      noarch
+Group:          User Interface/X
+License:        CC-BY
+Requires:       fontpackages-filesystem
+Source3:        %{name}-mutante-fontconfig.conf
+
+%description mutante-fonts
+Fantasy/display font used by the cave9 game, this font has only the basic
+characters used in the portuguese language was made as an experiment by the
+designer Jonas Kühner (http://www.criatipos.com/) the font was altered by
+the game developer to also include numbers.
+
+%_font_pkg -n mutante -f %{fontconf} mutante.ttf
+%doc data_README.txt
+
 %prep
 %setup -q -a1
 sed -i src/GNUmakefile -e "s/-Wall -Werror -ggdb//"
@@ -24,10 +46,24 @@ sed -i src/GNUmakefile -e "s/-Wall -Werr
 CFLAGS="%{optflags}" make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/usr/bin $RPM_BUILD_ROOT/usr/share/cave9
+rm -rf %{buildroot}
+mkdir -p %{buildroot}/usr/bin %{buildroot}/usr/share/cave9
 install -m 755 -p cave9 $RPM_BUILD_ROOT/usr/bin 
-cp -p data/wall.jpg data/icon.png data/thrust.wav data/crash.wav data/hit.wav data/hud.ttf $RPM_BUILD_ROOT/usr/share/cave9
+cp -p data/wall.jpg data/icon.png data/thrust.wav data/crash.wav data/hit.wav $RPM_BUILD_ROOT/usr/share/cave9
+
+install -m 0755 -d %{buildroot}%{_fontdir}
+install -m 0644 -p data/*.ttf %{buildroot}%{_fontdir}/mutante.ttf
+
+install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
+                   %{buildroot}%{_fontconfig_confdir}
+
+install -m 0644 -p %{SOURCE3} \
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
+ln -s %{_fontconfig_templatedir}/%{fontconf} \
+      %{buildroot}%{_fontconfig_confdir}/%{fontconf}
+
+ln -s ../../..%{_fontdir}/mutante.ttf $RPM_BUILD_ROOT/usr/share/cave9/hud.ttf
+
 mv data/README.txt data_README.txt
 desktop-file-install --vendor="fedora"                    \
   --dir=${RPM_BUILD_ROOT}%{_datadir}/applications         \
@@ -44,8 +80,23 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/fedora-cave9.desktop
 
 %changelog
-* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Wed Jun 24 2009 Victor Bogado <victor at bogado.net> 0.3-8
+- removed the redundant ownership of the fontdir.
+- lowered the priority
+- Updated the font configuration to better match the suggested template.
+
+* Tue Jun 23 2009 Victor Bogado <victor at bogado.net> 0.3-7
+- following the tips from Nicolas Mailhot on bug#477371
+
+* Mon Jun 22 2009 Victor Bogado <victor at bogado.net> 0.3-6
+- adapted the font subpackge to the new template on Fedora 11
+
+* Wed Jan 14 2009 Victor Bogado <victor at bogado.net> 0.3-5
+- Added a fontconfig file.
+- Renamed the font file subpackage to follow the font package naming convention.
+
+* Tue Dec 30 2008 Victor Bogado <victor at bogado.net> 0.3-4
+- Separate the font into a new package.
 
 * Sun Nov 09 2008 Victor Bogado <victor at bogado.net> 0.3-3
 - Use install -m 755 to ensure correct mode for binaries.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/cave9/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	15 Nov 2008 13:27:46 -0000	1.1
+++ import.log	1 Jul 2009 23:46:00 -0000	1.2
@@ -1 +1,2 @@
 cave9-0_3-3_bog9:HEAD:cave9-0.3-3.bog9.src.rpm:1226755599
+cave9-0_3-8_bog11:HEAD:cave9-0.3-8.bog11.src.rpm:1246491883