[pokerth/f16] fix mistake in git merge

[Itamar Reis Peixoto]

commit 1b700dffff5b98c88b3f25084fea31ed1cb1d623
Author: Itamar Reis Peixoto <itamar at ispbrasil.com.br>
Date:   Sun Aug 12 20:02:03 2012 -0300

    fix mistake in git merge

 pokerth.spec |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/pokerth.spec b/pokerth.spec
index 78a9dd1..eb182d4 100644
--- a/pokerth.spec
+++ b/pokerth.spec
@@ -1,6 +1,6 @@
 Name:           pokerth
 Version:        0.9.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A Texas-Holdem poker game
 Group:          Amusements/Games
 License:        GPLv2+
@@ -62,9 +62,7 @@ make install INSTALL_ROOT=%{buildroot} COPY="cp -p -f"
 install -D -p -m 755 %{name} %{buildroot}%{_bindir}/%{name}
 install -D -p -m 755 bin/%{name}_server %{buildroot}%{_bindir}/%{name}_server
 
-# Remove bundled fonts
-rm %{buildroot}%{_datadir}/%{name}/data/fonts/{VeraBd.ttf,c059013l.pfb,n019003l.pfb}
-# and replace them with symlinks
+# Remove bundled fonts and replace them with symlinks
 ln -s %{_datadir}/fonts/default/Type1/c059013l.pfb %{buildroot}%{_datadir}/%{name}/data/fonts/
 #ln -s %{_datadir}/fonts/default/Type1/n019003l.pfb %{buildroot}%{_datadir}/%{name}/data/fonts/
 ln -s %{_datadir}/fonts/dejavu/DejaVuSans-Bold.ttf %{buildroot}%{_datadir}/%{name}/data/fonts/VeraBd.ttf
@@ -85,6 +83,9 @@ rm -rf %{buildroot}
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Sun Aug 12 2012 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.9.5-4
+- fix a mistake during git merge
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild