[rcssserver: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/rcssserver

[Hedayat Vatankhah]

commit f9e8335543abab6013e9dccd821704e6dcec9265
Merge: c0dd899 44aca57
Author: Hedayat Vatankhah <hedayat.fwd at gmail.com>
Date:   Fri Jul 22 17:16:58 2011 +0430

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/rcssserver
    
    Conflicts:
    	rcssserver.spec

 ax_boost_base-64bit.patch |   13 +++++++++++++
 rcssserver.spec           |   10 ++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)
---
diff --cc rcssserver.spec
index 0361e2e,1339486..e773d95
--- a/rcssserver.spec
+++ b/rcssserver.spec
@@@ -1,6 -1,6 +1,6 @@@
  Name:           rcssserver
  Version:        15.0.0
--Release:        2%{?dist}
++Release:        3%{?dist}
  Summary:        Robocup 2D Soccer Simulation Server
  
  Group:          Applications/System
@@@ -98,9 -101,9 +101,12 @@@ rm -rf %{buildroot
  %{_datadir}/applications/*
  
  %changelog
- * Fri Jul 22 2011 Hedayat Vatankhah <hedayat.fwd+rpmchlog at gmail.com> - 15.0.0-2
++* Fri Jul 22 2011 Hedayat Vatankhah <hedayat.fwd+rpmchlog at gmail.com> - 15.0.0-3
 +- Rebuild for Boost 1.47
 +
+ * Fri May 27 2011 Dan Horák <dan[at]danny.cz> - 15.0.0-2
+ - fix build on non-x86 64-bit architectures
+ 
  * Thu May 19 2011 Hedayat Vatankhah <hedayat.fwd+rpmchlog at gmail.com> - 15.0.0-1
  - Updated to 15.0.0 upstream version