dist-git conversion

- Updated source URL.

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: mmapper
-# $Id$
-NAME := mmapper
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

import.log

@@ -1 +0,0 @@
-mmapper-2_0_4-2_final2_fc12:HEAD:mmapper-2.0.4-2.final2.fc12.src.rpm:1250150670

mmapper-fix-renderer-crash.patch

@@ -0,0 +1,49 @@
+Index: src/display/mapcanvas.cpp
+===================================================================
+--- src/display/mapcanvas.cpp	(revision 179)
++++ src/display/mapcanvas.cpp	(revision 180)
+@@ -844,6 +844,8 @@
+   {
+     m_scrollX = x;
+     m_scrollY = y;
++
++    makeCurrent();
+     resizeGL(width(), height());
+     updateGL();
+   }
+@@ -851,6 +853,8 @@
+   void MapCanvas::setHorizontalScroll(int x)
+   {
+     m_scrollX = x;
++
++    makeCurrent();
+     resizeGL(width(), height());
+     updateGL();
+   }
+@@ -858,6 +862,8 @@
+   void MapCanvas::setVerticalScroll(int y)
+   {
+     m_scrollY = y;
++
++    makeCurrent();
+     resizeGL(width(), height());
+     updateGL();
+   }
+@@ -867,6 +873,8 @@
+     m_scaleFactor += 0.05f;
+     if (m_scaleFactor > 2.0f)
+       m_scaleFactor -= 0.05f;
++
++    makeCurrent();
+     resizeGL(width(), height());
+     updateGL();
+   }
+@@ -876,6 +884,8 @@
+     m_scaleFactor -= 0.05f;
+     if (m_scaleFactor < 0.04f)
+       m_scaleFactor += 0.05f;
++
++    makeCurrent();
+     resizeGL(width(), height());
+     updateGL();
+   }

mmapper.spec

@@ -2,7 +2,7 @@
 
 Name:           mmapper
 Version:        2.0.4
-Release:        2.%{extraversion}%{?dist}
+Release:        5.%{extraversion}%{?dist}
 Summary:        Graphical MUME mapper
 
 Group:          Amusements/Games
@@ -20,7 +20,8 @@ Group:          Amusements/Games
 # The rest of the source files are GPLv2+
 License:        GPLv2
 URL:            http://sourceforge.net/projects/mmapper
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}%20%{version}%20%28final%29/%{name}-%{version}-%{extraversion}-source.tar.gz
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}-%{extraversion}-source.tar.gz
+Patch1:         mmapper-fix-renderer-crash.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake
@@ -38,6 +39,7 @@ data in real time and show player's position in a map.
 
 %prep
 %setup -q -n %{name}-%{version}-%{extraversion}-source
+%patch1 -p0 -b .renderer-crash
 
 
 %build
@@ -86,6 +88,15 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Thu Feb 25 2010 Kalev Lember <kalev@smartlink.ee> - 2.0.4-5.final2
+- Added patch to fix renderer crash with Qt 4.6
+
+* Thu Feb 25 2010 Kalev Lember <kalev@smartlink.ee> - 2.0.4-4.final2
+- Rebuilt with Qt 4.6
+
+* Mon Nov 23 2009 Kalev Lember <kalev@smartlink.ee> - 2.0.4-3.final2
+- Updated source URL.
+
 * Tue Aug 11 2009 Kalev Lember <kalev@smartlink.ee> - 2.0.4-2.final2
 - Changed license tag to read "GPLv2" as there is GPLv2-only code in the mix.