[mapserver] Update to latest stable release

[Pavel Lisý]

commit f9d4a037df75bd67c8c9b42810a362103e209133
Author: Pavel Lisý <pali at fedoraproject.org>
Date:   Tue May 21 15:19:32 2013 +0200

    Update to latest stable release
    
    - BZ 910689 - dependency on bitstream-vera-sans-fonts changed to dejavu-sans-fonts
    - BZ 960856 - Missing dependency: bitstream-vera-sans-fonts
    - BZ 747421 - Move CGI executable from /usr/sbin to /usr/libexec
    - BZ 796344 - Not compatible with JDK7
    - BZ 846543 - mapserver-java is incorrectly packaged (missing required native library)

 mapserver.spec |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
---
diff --git a/mapserver.spec b/mapserver.spec
index c1e395d..6db79d5 100644
--- a/mapserver.spec
+++ b/mapserver.spec
@@ -330,8 +330,7 @@ chmod 755 %{buildroot}%{perl_vendorarch}/auto/mapscript%{MS_REL}/mapscript%{MS_R
 * Tue Jul 10 2012 Petr Pisar <ppisar at redhat.com> - 6.0.3-2
 - Perl 5.16 rebuild
 
-* Sat Jun 30 2012 Devrim GÜNDÜZ <devrim at gunduz.org> - 6.0.3-1
->>>>>>> 0ccec574f0b9a1c369f9233a4f4dcf43f7e118c4
+* Fri Oct 12 2012 Pavel Lisý <pali at fedoraproject.org> - 6.0.3-1
 - Update to 6.0.3, for various fixes described at:
   https://github.com/mapserver/mapserver/blob/b8e6e0cbe0e5ff6c1a4ac682a67b108b19fc4edd/HISTORY.TXT
 - Merged from 6.0.3-3